chore(engine-rest/webapp): use Resteasy 3.10.0 on Tomcat

related to CAM-11285, PR (camunda#635)
chetanrahate · Feb 4, 2020 · f0af4ac · f0af4ac
1 parent cc1fe2b
commit f0af4ac
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 27 deletions.
diff --git a/distro/tomcat/webapp/pom.xml b/distro/tomcat/webapp/pom.xml
@@ -25,12 +25,6 @@
       <artifactId>resteasy-jaxrs</artifactId>
       <version>${version.resteasy3}</version>
     </dependency>
-    <!-- Resteasy 3.0.26 uses 1.0.1.Beta1, but it makes sense to use the final version -->
-    <dependency>
-      <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-      <version>1.0.1.Final</version>
-    </dependency>
   </dependencies>
 
   <build>
@@ -39,7 +33,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>       
+        <artifactId>maven-war-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/engine-rest/assembly/assembly-war-jbossas7.xml b/engine-rest/assembly/assembly-war-jbossas7.xml
@@ -20,7 +20,7 @@
         <include>org.camunda.bpm:camunda-engine-rest-jaxrs2:jar:*</include>
         <include>org.jboss.resteasy:resteasy-jaxrs:jar:*</include>
         <include>org.jboss.resteasy:async-http-servlet-3.0:jar:*</include>
-        <include>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:jar:*</include>
+        <include>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:jar:*</include>
       </includes>
     </dependencySet>
 

diff --git a/engine-rest/assembly/assembly-war-tomcat.xml b/engine-rest/assembly/assembly-war-tomcat.xml
@@ -20,7 +20,7 @@
         <include>org.camunda.bpm:camunda-engine-rest-jaxrs2:jar:*</include>
         <include>org.jboss.resteasy:resteasy-jaxrs:jar:*</include>
         <include>org.jboss.resteasy:async-http-servlet-3.0:jar:*</include>
-        <include>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:jar:*</include>
+        <include>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:jar:*</include>
       </includes>
     </dependencySet>
 

diff --git a/engine-rest/assembly/pom.xml b/engine-rest/assembly/pom.xml
@@ -62,17 +62,6 @@
       <version>${version.resteasy3}</version>
       <scope>provided</scope>
     </dependency>
-
-    <!-- this overrides a transitive dependency Resteasy 3.0.26;
-    Resteasy depends on 1.0.1.Beta1, which was compiled with Java 8 and therefore
-     does not work in Java 7 environments (e.g. JBoss 7). 1.0.1.Final
-     was compiled with Java 7. -->
-    <dependency>
-      <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-      <version>1.0.1.Final</version>
-      <scope>provided</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>

diff --git a/engine-rest/engine-rest-jaxrs2/pom.xml b/engine-rest/engine-rest-jaxrs2/pom.xml
@@ -11,6 +11,10 @@
     <relativePath>../</relativePath>
     <version>7.13.0-SNAPSHOT</version>
   </parent>
+
+  <properties>
+    <version.jaxrs>2.0</version.jaxrs>
+  </properties>
 
   <dependencies>
     <!-- compile -->
@@ -25,7 +29,7 @@
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>javax.ws.rs-api</artifactId>
-      <version>2.0</version>
+      <version>${version.jaxrs}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -112,10 +116,10 @@
 
     <profile>
       <id>resteasy3</id>
-
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
+      
+		  <properties>
+		    <version.jaxrs>2.1</version.jaxrs>
+		  </properties>
 
       <dependencies>
         <dependency>
@@ -128,7 +132,7 @@
         <dependency>
           <groupId>org.jboss.resteasy</groupId>
           <artifactId>resteasy-netty4</artifactId>
-          <version>3.0.19.Final</version>
+          <version>${version.resteasy3}</version>
           <scope>test</scope>
         </dependency>
 
@@ -137,6 +141,12 @@
           <artifactId>resteasy-jaxrs</artifactId>
           <version>${version.resteasy3}</version>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+	            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+	            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
 
         <dependency>
@@ -186,7 +196,13 @@
     </profile>
 
     <profile>
+      <!-- Besides testing with Jersey2, this profile currently ensures we are JAX-RS 2.0 compatible; 
+        The Resteasy profile uses a Resteasy version with JAX-RS 2.1 -->
       <id>jersey2</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+
       <dependencies>
         <dependency>
           <groupId>org.glassfish.jersey.containers</groupId>

diff --git a/engine-rest/engine-rest/pom.xml b/engine-rest/engine-rest/pom.xml
@@ -493,6 +493,111 @@
         </plugins>
       </build>
     </profile>
+
+
+    <profile>
+      <id>resteasy3</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.jboss.spec.javax.ws.rs</groupId>
+          <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+          <version>2.0.1.Final</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.jboss.resteasy</groupId>
+          <artifactId>resteasy-jaxrs</artifactId>
+          <version>${version.resteasy3}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <artifactId>httpclient</artifactId>
+              <groupId>org.apache.httpcomponents</groupId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-all</artifactId>
+          <version>4.1.42.Final</version>
+          <scope>test</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.jboss.resteasy</groupId>
+          <artifactId>resteasy-netty4</artifactId>
+          <version>${version.resteasy3}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!-- This test is only needed for the Resteasy 2 profile; with
+                  Resteasy 3 we can run the regular test -->
+                <exclude>**/ResteasyTaskRestServiceInteractionTest.java</exclude>
+              </excludes>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            </configuration>
+            <executions>
+              <execution>
+                <id>encoding-test</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <argLine>-Dfile.encoding=ISO-8859-1</argLine>
+                  <includes>
+                    <include>**/ProcessDefinitionRestServiceInteractionTest.java</include>
+                    <include>**/TaskRestServiceInteractionTest.java</include>
+                  </includes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>add-test-source</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>add-test-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>src/test/java-resteasy</source>
+                  </sources>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-test-resource</id>
+                <phase>generate-test-resources</phase>
+                <goals>
+                  <goal>add-test-resource</goal>
+                </goals>
+                <configuration>
+                  <resources>
+                    <resource>
+                      <directory>
+                        src/test/resources-resteasy
+                      </directory>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
     <profile>
       <id>wink</id>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -22,7 +22,7 @@
     <version.spring.framework>3.2.18.RELEASE</version.spring.framework>
     <version.cxf>3.0.3</version.cxf>
     <version.resteasy>2.3.5.Final</version.resteasy>
-    <version.resteasy3>3.0.26.Final</version.resteasy3>
+    <version.resteasy3>3.10.0.Final</version.resteasy3>
     <version.jersey2>2.25.1</version.jersey2>
     <version.groovy>2.4.13</version.groovy>
     <version.gson>2.8.5</version.gson>