Move to versioned folder name

dd-java-agent/instrumentation/finatra-2.9/finatra-2.9.gradle

@@ -0,0 +1,55 @@
+// Set properties before any plugins get loaded
+ext {
+  minJavaVersionForTests = JavaVersion.VERSION_1_8
+}
+
+apply from: "${rootDir}/gradle/java.gradle"
+apply from: "${rootDir}/gradle/test-with-scala.gradle"
+
+apply plugin: 'org.unbroken-dome.test-sets'
+
+testSets {
+
+  latestDepTest {
+    dirName = 'test'
+  }
+}
+
+muzzle {
+  // There are some weird library issues below 2.9 so can't assert inverse
+  pass {
+    group = 'com.twitter'
+    module = 'finatra-http_2.11'
+    versions = '[2.9.0,]'
+  }
+
+  pass {
+    group = 'com.twitter'
+    module = 'finatra-http_2.12'
+    versions = '[2.9.0,]'
+  }
+}
+
+dependencies {
+  compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0'
+
+  testCompile project(':dd-java-agent:instrumentation:netty-4.1')
+  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
+
+  testCompile group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
+  testCompile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10') {
+    force = true
+  }
+
+  // Required for older versions of finatra on JDKs >= 11
+  testCompile group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
+
+  latestDepTestCompile project(':dd-java-agent:instrumentation:netty-4.1')
+  latestDepTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
+  latestDepTestCompile group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
+}
+
+compileLatestDepTestGroovy {
+  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDir))
+  dependsOn compileLatestDepTestScala
+}

dd-java-agent/instrumentation/finatra/finatra.gradle

@@ -1,42 +0,0 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
-apply from: "${rootDir}/gradle/java.gradle"
-apply from: "${rootDir}/gradle/test-with-scala.gradle"
-
-// apply plugin: 'org.unbroken-dome.test-sets'
-//testSets {
-//
-//  latestDepTest {
-//    dirName = 'test'
-//  }
-//}
-
-muzzle {
-
-}
-
-dependencies {
-  compileOnly group: 'com.twitter', name: 'finagle-http_2.11', version: '19.1.0'
-  compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '19.1.0'
-
-  testCompile project(':dd-java-agent:instrumentation:netty-4.1')
-  testCompile project(':dd-java-agent:instrumentation:java-concurrent')
-  testCompile project(':dd-java-agent:instrumentation:trace-annotation')
-
-  testCompile group: 'com.twitter', name: 'finagle-http_2.11', version: '19.1.0'
-
-  testCompile(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.11', version: '2.10.2') {
-    force = true
-  }
-
-//  latestDepTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
-  // latestDepTestCompile project(':dd-java-agent:instrumentation:trace-annotation')
-}
-
-//compileLatestDepTestGroovy {
-//  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDir))
-//  dependsOn compileLatestDepTestScala
-//}

settings.gradle

@@ -60,7 +60,7 @@ include ':dd-java-agent:instrumentation:elasticsearch:transport-2'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-5'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-5.3'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-6'
-include ':dd-java-agent:instrumentation:finatra'
+include ':dd-java-agent:instrumentation:finatra-2.9'
 include ':dd-java-agent:instrumentation:glassfish'
 include ':dd-java-agent:instrumentation:google-http-client'
 include ':dd-java-agent:instrumentation:grizzly-2'