Standardize instrumentation module names (#145)

* Rename vertx module

* Rename glassfish module

* Rename google-http-client module

* Rename jms module

* Rename twilio module

* Move dropwizard-testing to top-level

Since it's not related to dropwizard-views.

* Rename dropwizard-views modules

* Rename aws-java-sdk-1.11.0 module

* Rename apache-httpasyncclient-4 module

* Rename apache-httpclient-4 module

* Rename datastax-cassandra-3 module

* Rename elasticsearch:rest-5 module

* Rename elasticsearch:transport-2 module

* Rename elasticsearch:transport-5 module

* Rename elasticsearch:transport-6 module

* Rename grizzly-2 module

* Rename jax-rs-annotations-1 module

* Rename jax-rs-annotations-2 module

* Rename filter-jersey module

* Rename jetty module

* Rename lettuce-5 module

* Rename okhttp-3 module

* Rename play-ws-1 module

* Rename play-ws-2 module

* Rename rxjava-1 module

* Rename request-2 module

* Rename request-3 module

* Rename spring-webflux-5 module

instrumentation/aws-java-sdk-1.11/aws-java-sdk-1.11.gradle

@@ -38,7 +38,7 @@ dependencies {
   compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'
 
   // Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
-  testCompile project(':instrumentation:apache-httpclient-4')
+  testCompile project(':instrumentation:apache-httpclient-4.0')
   testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106'
   testCompile group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106'
   testCompile group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106'

instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle

@@ -23,7 +23,7 @@ dependencies {
   main_java8CompileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
 
   // Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
-  testCompile project(':instrumentation:apache-httpclient-4')
+  testCompile project(':instrumentation:apache-httpclient-4.0')
   // Also include netty instrumentation because it is used by aws async client
   testCompile project(':instrumentation:netty-4.1')
   // Needed by netty async instrumentation
@@ -36,7 +36,7 @@ dependencies {
   testCompile group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.2.0'
   testCompile group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0'
 
-  latestDepTestCompile project(':instrumentation:apache-httpclient-4')
+  latestDepTestCompile project(':instrumentation:apache-httpclient-4.0')
   latestDepTestCompile project(':instrumentation:netty-4.1')
   latestDepTestCompile project(':instrumentation:java-concurrent')
 

instrumentation/couchbase-2.0/couchbase-2.0.gradle

@@ -48,7 +48,7 @@ artifacts {
 }
 
 dependencies {
-  compile project(':instrumentation:rxjava-1')
+  compile project(':instrumentation:rxjava-1.0')
 
   compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.0.0'
 

instrumentation/couchbase-2.6/couchbase-2.6.gradle

@@ -44,7 +44,7 @@ muzzle {
 }
 
 dependencies {
-  compile project(':instrumentation:rxjava-1')
+  compile project(':instrumentation:rxjava-1.0')
 
   compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
 

instrumentation/dropwizard-testing/dropwizard-testing.gradle

@@ -10,8 +10,8 @@ apply from: "${rootDir}/gradle/java.gradle"
 
 dependencies {
   testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:jax-rs-annotations-2')
-  testCompile project(':instrumentation:servlet:request-3')
+  testCompile project(':instrumentation:jax-rs-annotations-2.0')
+  testCompile project(':instrumentation:servlet:request-3.0')
 
   // First version with DropwizardTestSupport:
   testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'

instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle

@@ -31,8 +31,8 @@ dependencies {
 
   compile project(':instrumentation:elasticsearch')
 
-  testCompile project(':instrumentation:apache-httpclient-4')
-  testCompile project(':instrumentation:apache-httpasyncclient-4')
+  testCompile project(':instrumentation:apache-httpclient-4.0')
+  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
 
   testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
   testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'

instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle

@@ -32,8 +32,8 @@ dependencies {
 
   compile project(':instrumentation:elasticsearch')
 
-  testCompile project(':instrumentation:apache-httpclient-4')
-  testCompile project(':instrumentation:apache-httpasyncclient-4')
+  testCompile project(':instrumentation:apache-httpclient-4.0')
+  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   // Netty is used, but it adds complexity to the tests since we're using embedded ES.
   //testCompile project(':instrumentation:netty-4.1')
 

instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle

@@ -27,9 +27,9 @@ dependencies {
   compile project(':instrumentation:elasticsearch')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:rest-5')
-  testCompile project(':instrumentation:elasticsearch:transport-5')
-  testCompile project(':instrumentation:apache-httpasyncclient-4')
+  testCompile project(':instrumentation:elasticsearch:rest-5.0')
+  testCompile project(':instrumentation:elasticsearch:transport-5.0')
+  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
 
   testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
 

instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle

@@ -27,8 +27,8 @@ dependencies {
   compile project(':instrumentation:elasticsearch')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:rest-5')
-  testCompile project(':instrumentation:apache-httpasyncclient-4')
+  testCompile project(':instrumentation:elasticsearch:rest-5.0')
+  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   testCompile project(':instrumentation:netty-4.1')
 
   testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'

instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle

@@ -34,7 +34,7 @@ dependencies {
 
   compile project(':instrumentation:elasticsearch')
 
-  testCompile project(':instrumentation:apache-httpasyncclient-4')
+  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   testCompile project(':instrumentation:netty-4.1')
   testCompile project(':instrumentation:spring-data-1.8')
 

instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle

@@ -35,8 +35,8 @@ dependencies {
   compile project(':instrumentation:elasticsearch')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:rest-5')
-  testCompile project(':instrumentation:apache-httpasyncclient-4')
+  testCompile project(':instrumentation:elasticsearch:rest-5.0')
+  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   testCompile project(':instrumentation:netty-4.1')
 
   testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'

instrumentation/glassfish-3.0/glassfish-3.0.gradle

@@ -22,8 +22,8 @@ testSets {
 }
 
 dependencies {
-  testCompile project(':instrumentation:servlet:request-3')
-  testCompile project(':instrumentation:grizzly-2')
+  testCompile project(':instrumentation:servlet:request-3.0')
+  testCompile project(':instrumentation:grizzly-2.0')
 
   testCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
   latestDepTestCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '+'