Merge pull request #1056 from DataDog/tyler/fix-jaxrsclient-version

Fix jax-rs-client minimum supported version

dd-java-agent/instrumentation/jax-rs-client-1.1/jax-rs-client-1.1.gradle

@@ -2,13 +2,7 @@ muzzle {
   pass {
     group = "com.sun.jersey"
     module = "jersey-client"
-    versions = "[1.9,)"
-    // We can't assert inverse because 1.1.5.2 was a weird release that also works.
-  }
-  fail {
-    group = "com.sun.jersey"
-    module = "jersey-client"
-    versions = "[1.2,1.9)"
+    versions = "[,]"
   }
 }
 
@@ -23,9 +17,9 @@ testSets {
 }
 
 dependencies {
-  compileOnly group: 'com.sun.jersey', name: 'jersey-client', version: '1.9'
+  compileOnly group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
 
-  testCompile group: 'com.sun.jersey', name: 'jersey-client', version: '1.9'
+  testCompile group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
 
   latestDepTestCompile group: 'com.sun.jersey', name: 'jersey-client', version: '+'
 }

dd-java-agent/instrumentation/jax-rs-client-1.1/src/test/groovy/JaxRsClientV1Test.groovy

@@ -1,6 +1,5 @@
 import com.sun.jersey.api.client.Client
 import com.sun.jersey.api.client.ClientResponse
-import com.sun.jersey.api.client.filter.CsrfProtectionFilter
 import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter
 import com.sun.jersey.api.client.filter.LoggingFilter
 import datadog.trace.agent.test.base.HttpClientTest
@@ -16,7 +15,6 @@ class JaxRsClientV1Test extends HttpClientTest<JaxRsClientV1Decorator> {
     // Add filters to ensure spans aren't duplicated.
     client.addFilter(new LoggingFilter())
     client.addFilter(new GZIPContentEncodingFilter())
-    client.addFilter(new CsrfProtectionFilter())
   }
 
   @Override

settings.gradle

@@ -53,7 +53,7 @@ include ':dd-java-agent:instrumentation:http-url-connection'
 include ':dd-java-agent:instrumentation:hystrix-1.4'
 include ':dd-java-agent:instrumentation:jax-rs-annotations-1'
 include ':dd-java-agent:instrumentation:jax-rs-annotations-2'
-include ':dd-java-agent:instrumentation:jax-rs-client-1.9'
+include ':dd-java-agent:instrumentation:jax-rs-client-1.1'
 include ':dd-java-agent:instrumentation:jax-rs-client-2.0'
 include ':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-jersey'
 include ':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-resteasy'