From f39aa0f080950d9ea4bc5217fd76974ad3a0ba5d Mon Sep 17 00:00:00 2001
From: Alessio Soldano <asoldano@redhat.com>
Date: Fri, 13 Apr 2018 01:17:11 +0200
Subject: [PATCH] [RESTEASY-1843] More fixes

---
 resteasy-client/jaxrs20/pom.xml |   8 +-
 resteasy-client/pom.xml         | 126 ++++++++-----------------------
 resteasy-jaxrs/jaxrs20/pom.xml  |   1 +
 resteasy-jaxrs/pom.xml          | 127 +++++++-------------------------
 4 files changed, 56 insertions(+), 206 deletions(-)

diff --git a/resteasy-client/jaxrs20/pom.xml b/resteasy-client/jaxrs20/pom.xml
index 5137a13e5a2..03543376a6a 100644
--- a/resteasy-client/jaxrs20/pom.xml
+++ b/resteasy-client/jaxrs20/pom.xml
@@ -20,14 +20,8 @@
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs</artifactId>
+            <artifactId>resteasy-jaxrs-20</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.ws.rs</groupId>
-                    <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>
diff --git a/resteasy-client/pom.xml b/resteasy-client/pom.xml
index 758d6f38191..4cca928a3a8 100755
--- a/resteasy-client/pom.xml
+++ b/resteasy-client/pom.xml
@@ -17,17 +17,14 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.ws.rs</groupId>
-                    <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
@@ -56,98 +53,33 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jaxrs20</id>
-            <activation>
-                <property>
-                    <name>jaxrs20</name>
-                </property>
-            </activation>
-            <dependencies>
-		        <dependency>
-		            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-		            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-		        </dependency>
-            </dependencies>
-            <build>
-                <directory>target/jaxrs20</directory>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>add-jaxrs20-sources</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <inherited>false</inherited>
-                                <configuration>
-                                    <sources>
-                                        <source>${basedir}/src/main/jaxrs20/</source>
-                                    </sources>
-                                </configuration>
-				            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>add-jaxrs21-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <inherited>false</inherited>
                         <configuration>
-                            <classifier>jaxrs20</classifier>
+                            <sources>
+                                <source>${basedir}/src/main/jaxrs21/</source>
+                            </sources>
                         </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <configuration>
-                            <classifier>jaxrs20-sources</classifier>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>jaxrs21</id>
-            <activation>
-                <property>
-                    <name>!jaxrs20</name>
-                </property>
-            </activation>
-            <dependencies>
-		        <dependency>
-		            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-		            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-		        </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>add-jaxrs21-sources</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <inherited>false</inherited>
-                                <configuration>
-                                    <sources>
-                                        <source>${basedir}/src/main/jaxrs21/</source>
-                                    </sources>
-                                </configuration>
-				            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <profiles>
         <profile>
             <id>i18n</id>
             <activation>
diff --git a/resteasy-jaxrs/jaxrs20/pom.xml b/resteasy-jaxrs/jaxrs20/pom.xml
index d9436ecf8de..4a21a88bbaf 100644
--- a/resteasy-jaxrs/jaxrs20/pom.xml
+++ b/resteasy-jaxrs/jaxrs20/pom.xml
@@ -20,6 +20,7 @@
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>
             <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/resteasy-jaxrs/pom.xml b/resteasy-jaxrs/pom.xml
index d6968bbbbbd..74b6574bfa7 100755
--- a/resteasy-jaxrs/pom.xml
+++ b/resteasy-jaxrs/pom.xml
@@ -127,7 +127,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.microprofile.rest.client</groupId>
             <artifactId>microprofile-rest-client-api</artifactId>
@@ -145,110 +144,34 @@
                 <groupId>com.atlassian.maven.plugins</groupId>
                 <artifactId>clover-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>add-jaxrs21-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources-jaxrs21/</directory>
+                                    <excludes>
+                                        <exclude>**/junk/**</exclude>
+                                    </excludes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>
-        <profile>
-            <id>jaxrs20</id>
-            <activation>
-                <property>
-                    <name>jaxrs20</name>
-                </property>
-            </activation>
-            <dependencies>
-		        <dependency>
-		            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-		            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-		        </dependency>
-            </dependencies>
-            <build>
-                <directory>target/jaxrs20</directory>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>add-jaxrs20-resources</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>add-resource</goal>
-                                </goals>
-                                <inherited>false</inherited>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>${basedir}/src/main/resources-jaxrs20/</directory>
-                                            <excludes>
-                                                <exclude>**/junk/**</exclude>
-                                            </excludes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-				            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <configuration>
-                            <classifier>jaxrs20</classifier>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <configuration>
-                            <classifier>jaxrs20-sources</classifier>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>jaxrs21</id>
-            <activation>
-                <property>
-                    <name>!jaxrs20</name>
-                </property>
-            </activation>
-            <dependencies>
-		        <dependency>
-		            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-		            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-		        </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>add-jaxrs21-resources</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>add-resource</goal>
-                                </goals>
-                                <inherited>false</inherited>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>${basedir}/src/main/resources-jaxrs21/</directory>
-                                            <excludes>
-                                                <exclude>**/junk/**</exclude>
-                                            </excludes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-				            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <!-- exclude integrations tests which are known to fail -->
             <id>exclude-known-tests-failures</id>