diff --git a/benchmark-integration/play-perftest/play-perftest.gradle b/benchmark-integration/play-perftest/play-perftest.gradle
index 5cf3c713b4c0..065fc76cdae1 100644
--- a/benchmark-integration/play-perftest/play-perftest.gradle
+++ b/benchmark-integration/play-perftest/play-perftest.gradle
@@ -9,7 +9,6 @@ afterEvaluate {
 }
 
 ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
   playVersion = "2.6.20"
   scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")
 }
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 2bb15c2a5449..7abd9db561e4 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -33,7 +33,7 @@ if (applyCodeCoverage) {
 if (project.hasProperty("minJavaVersionForTests")) {
   project.ext.release = project.getProperty("minJavaVersionForTests")
 } else {
-  project.ext.release = JavaVersion.VERSION_1_7
+  project.ext.release = JavaVersion.VERSION_1_8
 }
 
 java {
@@ -173,13 +173,6 @@ project.afterEvaluate {
   }
 }
 
-if (project.hasProperty("removeJarVersionNumbers") && removeJarVersionNumbers) {
-  tasks.withType(AbstractArchiveTask).configureEach {
-    version = null
-  }
-}
-
-
 if (!rootProject.ext.has("javaExecutableVersionCache")) {
   rootProject.ext.javaExecutableVersionCache = [:]
 }
@@ -261,10 +254,6 @@ def addTestRule(String testTaskName) {
           tasks.withType(Test).all {
             executable = toExecutable(javaHomeForTests)
             enabled = isJavaVersionAllowed(requestedJavaVersion)
-            if (requestedJavaVersion.isJava7()) {
-              // Disable JIT for this method. Sometimes Java7 JVM crashes trying to compile it.
-              jvmArgs '-XX:CompileCommand=exclude,net.bytebuddy.description.type.TypeDescription$Generic$Visitor$Substitutor::onParameterizedType'
-            }
           }
         } else {
           throw new BuildCancelledException("Requested java version $requestedJavaVersion not found")
diff --git a/instrumentation-core/reactor-3.1/reactor-3.1.gradle b/instrumentation-core/reactor-3.1/reactor-3.1.gradle
index 90e9505565b4..e3a580b2011b 100644
--- a/instrumentation-core/reactor-3.1/reactor-3.1.gradle
+++ b/instrumentation-core/reactor-3.1/reactor-3.1.gradle
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 group = 'io.opentelemetry.instrumentation'
 
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
diff --git a/instrumentation/akka-http-10.0/akka-http-10.0.gradle b/instrumentation/akka-http-10.0/akka-http-10.0.gradle
index 6fccbd4eb23f..a7846b594f92 100644
--- a/instrumentation/akka-http-10.0/akka-http-10.0.gradle
+++ b/instrumentation/akka-http-10.0/akka-http-10.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-scala.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
diff --git a/instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle b/instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle
index 89fa14e315b1..fb2fc2bed7e5 100644
--- a/instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle
+++ b/instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle b/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle
index a32f097bcfea..ad37a906daf2 100644
--- a/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle
+++ b/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/armeria-1.0/library/armeria-1.0-library.gradle b/instrumentation/armeria-1.0/library/armeria-1.0-library.gradle
index 0d94014f0957..7af95f4a68d4 100644
--- a/instrumentation/armeria-1.0/library/armeria-1.0-library.gradle
+++ b/instrumentation/armeria-1.0/library/armeria-1.0-library.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
 apply plugin: "net.ltgt.errorprone"
 
diff --git a/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle b/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle
index 795536fe718b..28c21321a6bd 100644
--- a/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle
+++ b/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle
@@ -13,11 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
 
 dependencies {
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle
index f0ad310f0ed6..cae3820c56b0 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle
index b3b76a616e00..bab0dcfb1d65 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
 
 dependencies {
diff --git a/instrumentation/cassandra/cassandra-3.0/cassandra-3.0.gradle b/instrumentation/cassandra/cassandra-3.0/cassandra-3.0.gradle
index 98c960344cc1..e38b721cb6d1 100644
--- a/instrumentation/cassandra/cassandra-3.0/cassandra-3.0.gradle
+++ b/instrumentation/cassandra/cassandra-3.0/cassandra-3.0.gradle
@@ -1,22 +1,13 @@
 // Set properties before any plugins get loaded
 ext {
   // TODO switch to container-based tests (away from cassandraunit)
-  // Tests use cassandraunit, which runs embedded Cassandra 3, which requires Java 8
-  // (and is currently incompatible with Java 9.)
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
+  // Tests use cassandraunit, which runs embedded Cassandra 3, which is currently incompatible with Java 9.
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
   cassandraDriverTestVersions = "[3.0,4.0)"
 }
 
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
-// TODO switch to container-based tests (away from cassandraunit)
-//   then we can run tests using Java 7 (see above) and won't need this override section
-java {
-  sourceCompatibility = JavaVersion.VERSION_1_7
-  targetCompatibility = JavaVersion.VERSION_1_7
-}
-
 muzzle {
 
   pass {
diff --git a/instrumentation/cassandra/cassandra-4.0/cassandra-4.0.gradle b/instrumentation/cassandra/cassandra-4.0/cassandra-4.0.gradle
index 2d5b7f32c62e..274c312c075a 100644
--- a/instrumentation/cassandra/cassandra-4.0/cassandra-4.0.gradle
+++ b/instrumentation/cassandra/cassandra-4.0/cassandra-4.0.gradle
@@ -1,6 +1,5 @@
 // Set properties before any plugins get loaded
 ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
   cassandraDriverTestVersions = "[4.0,)"
 }
diff --git a/instrumentation/couchbase/couchbase-2.0/couchbase-2.0.gradle b/instrumentation/couchbase/couchbase-2.0/couchbase-2.0.gradle
index df9a631cc82e..1ab6a9955a8f 100644
--- a/instrumentation/couchbase/couchbase-2.0/couchbase-2.0.gradle
+++ b/instrumentation/couchbase/couchbase-2.0/couchbase-2.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/couchbase/couchbase-2.6/couchbase-2.6.gradle b/instrumentation/couchbase/couchbase-2.6/couchbase-2.6.gradle
index b47f3cfd9a74..fde810743f06 100644
--- a/instrumentation/couchbase/couchbase-2.6/couchbase-2.6.gradle
+++ b/instrumentation/couchbase/couchbase-2.6/couchbase-2.6.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle b/instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle
index a026d8c12a84..fef394519c7a 100644
--- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle
+++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle b/instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle
index 5f0612d981c2..70cd6069f3ab 100644
--- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle
+++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle
index ff4bbe22b689..f32f9921de21 100644
--- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle
+++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
index 112bdc6e209c..ef680a639a74 100644
--- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
+++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle b/instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle
index 7e019d1b5966..2326a880b472 100644
--- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle
+++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/finatra-2.9/finatra-2.9.gradle b/instrumentation/finatra-2.9/finatra-2.9.gradle
index fad863aceaf5..024aac5cc445 100644
--- a/instrumentation/finatra-2.9/finatra-2.9.gradle
+++ b/instrumentation/finatra-2.9/finatra-2.9.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-scala.gradle"
 
diff --git a/instrumentation/geode-1.4/geode-1.4.gradle b/instrumentation/geode-1.4/geode-1.4.gradle
index 984f8667b256..936fd7d6b784 100644
--- a/instrumentation/geode-1.4/geode-1.4.gradle
+++ b/instrumentation/geode-1.4/geode-1.4.gradle
@@ -1,8 +1,3 @@
-// Geode only supports Java 8+
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/grizzly-client-1.9/grizzly-client-1.9.gradle b/instrumentation/grizzly-client-1.9/grizzly-client-1.9.gradle
index 8f9bb394b326..f7c1715c6281 100644
--- a/instrumentation/grizzly-client-1.9/grizzly-client-1.9.gradle
+++ b/instrumentation/grizzly-client-1.9/grizzly-client-1.9.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/hibernate/hibernate-4.3/hibernate-4.3.gradle b/instrumentation/hibernate/hibernate-4.3/hibernate-4.3.gradle
index bb79bf281ecf..3fd09c472b3e 100644
--- a/instrumentation/hibernate/hibernate-4.3/hibernate-4.3.gradle
+++ b/instrumentation/hibernate/hibernate-4.3/hibernate-4.3.gradle
@@ -21,7 +21,8 @@ dependencies {
 
   testLibrary group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
   testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
-  testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.5.1.RELEASE'
+  //First version to work with Java 14
+  testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.8.0.RELEASE'
 
   // TODO(anuraaga): Investigate why these tests don't pass on 5 or 6
   // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/1042
diff --git a/instrumentation/java-concurrent/java-concurrent.gradle b/instrumentation/java-concurrent/java-concurrent.gradle
index f4cb39c7c946..4eef92f4d94c 100644
--- a/instrumentation/java-concurrent/java-concurrent.gradle
+++ b/instrumentation/java-concurrent/java-concurrent.gradle
@@ -1,9 +1,3 @@
-ext {
-  // TODO (trask) currently this is only needed for LambdaGen
-  //  revisit if we don't end up dropping Java 7
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/jaxrs-2.0-common.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/jaxrs-2.0-common.gradle
index f98eee29bedc..83b2eb2a8c9e 100644
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/jaxrs-2.0-common.gradle
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/jaxrs-2.0-common.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/khttp-0.1/khttp-0.1.gradle b/instrumentation/khttp-0.1/khttp-0.1.gradle
index 856e2fa107d5..de6c835a40d8 100644
--- a/instrumentation/khttp-0.1/khttp-0.1.gradle
+++ b/instrumentation/khttp-0.1/khttp-0.1.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/kotlin-coroutines/kotlin-coroutines.gradle b/instrumentation/kotlin-coroutines/kotlin-coroutines.gradle
index 19972713d9bf..a1f8ba451b86 100644
--- a/instrumentation/kotlin-coroutines/kotlin-coroutines.gradle
+++ b/instrumentation/kotlin-coroutines/kotlin-coroutines.gradle
@@ -1,9 +1,3 @@
-ext {
-  // TODO (trask) currently this is only needed for LambdaGen
-  //  revisit if we don't end up dropping Java 7
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-kotlin.gradle"
 
diff --git a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle
index 34525010409a..a363901bdb92 100644
--- a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle
+++ b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle
@@ -1,9 +1,5 @@
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 muzzle {
   pass {
     group = "io.kubernetes"
diff --git a/instrumentation/lettuce/lettuce-4.0/lettuce-4.0.gradle b/instrumentation/lettuce/lettuce-4.0/lettuce-4.0.gradle
index d38ede08c355..62563780d212 100644
--- a/instrumentation/lettuce/lettuce-4.0/lettuce-4.0.gradle
+++ b/instrumentation/lettuce/lettuce-4.0/lettuce-4.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle b/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle
index 1063ce0f0dd3..0d2633ee3423 100644
--- a/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle
+++ b/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle b/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle
index 2b89ecdb8e81..a340dd45734a 100644
--- a/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle
+++ b/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "${rootDir}/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle b/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle
index ec0fa655eebc..b4bb217fbaa3 100644
--- a/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle
+++ b/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
 
 dependencies {
diff --git a/instrumentation/mongo/mongo-async-3.3/mongo-async-3.3.gradle b/instrumentation/mongo/mongo-async-3.3/mongo-async-3.3.gradle
index 49c37fa21c85..e7ec37252348 100644
--- a/instrumentation/mongo/mongo-async-3.3/mongo-async-3.3.gradle
+++ b/instrumentation/mongo/mongo-async-3.3/mongo-async-3.3.gradle
@@ -1,9 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  // Since we're using CompletableFutures in the test...
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/netty/netty-3.8/netty-3.8.gradle b/instrumentation/netty/netty-3.8/netty-3.8.gradle
index 55a30db63aea..83210be660af 100644
--- a/instrumentation/netty/netty-3.8/netty-3.8.gradle
+++ b/instrumentation/netty/netty-3.8/netty-3.8.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
diff --git a/instrumentation/netty/netty-4.0/netty-4.0.gradle b/instrumentation/netty/netty-4.0/netty-4.0.gradle
index b77b67d78140..d88476fa8ba6 100644
--- a/instrumentation/netty/netty-4.0/netty-4.0.gradle
+++ b/instrumentation/netty/netty-4.0/netty-4.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/netty/netty-4.1/netty-4.1.gradle b/instrumentation/netty/netty-4.1/netty-4.1.gradle
index cd797d4c6426..8578b0e26677 100644
--- a/instrumentation/netty/netty-4.1/netty-4.1.gradle
+++ b/instrumentation/netty/netty-4.1/netty-4.1.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/play-ws/play-ws-1.0/play-ws-1.0.gradle b/instrumentation/play-ws/play-ws-1.0/play-ws-1.0.gradle
index 23503134b1bf..1d21a381d90d 100644
--- a/instrumentation/play-ws/play-ws-1.0/play-ws-1.0.gradle
+++ b/instrumentation/play-ws/play-ws-1.0/play-ws-1.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/play-ws/play-ws-2.0/play-ws-2.0.gradle b/instrumentation/play-ws/play-ws-2.0/play-ws-2.0.gradle
index 7ad6d2401064..4a5f8a89804a 100644
--- a/instrumentation/play-ws/play-ws-2.0/play-ws-2.0.gradle
+++ b/instrumentation/play-ws/play-ws-2.0/play-ws-2.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/play-ws/play-ws-2.1/play-ws-2.1.gradle b/instrumentation/play-ws/play-ws-2.1/play-ws-2.1.gradle
index a29a68bd458d..850bb852fed9 100644
--- a/instrumentation/play-ws/play-ws-2.1/play-ws-2.1.gradle
+++ b/instrumentation/play-ws/play-ws-2.1/play-ws-2.1.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/play-ws/play-ws-common/play-ws-common.gradle b/instrumentation/play-ws/play-ws-common/play-ws-common.gradle
index cfb3b977265d..ae13806563de 100644
--- a/instrumentation/play-ws/play-ws-common/play-ws-common.gradle
+++ b/instrumentation/play-ws/play-ws-common/play-ws-common.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 def scalaVersion = '2.12'
diff --git a/instrumentation/play/play-2.3/play-2.3.gradle b/instrumentation/play/play-2.3/play-2.3.gradle
index d43a48d98a18..00db885cde8c 100644
--- a/instrumentation/play/play-2.3/play-2.3.gradle
+++ b/instrumentation/play/play-2.3/play-2.3.gradle
@@ -1,5 +1,4 @@
 ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
   // Play doesn't work with Java 9+ until 2.6.12
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
 }
diff --git a/instrumentation/play/play-2.4/play-2.4.gradle b/instrumentation/play/play-2.4/play-2.4.gradle
index 7dc678db38b9..9ce46323e204 100644
--- a/instrumentation/play/play-2.4/play-2.4.gradle
+++ b/instrumentation/play/play-2.4/play-2.4.gradle
@@ -1,5 +1,4 @@
 ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
   // Play doesn't work with Java 9+ until 2.6.12
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
 }
diff --git a/instrumentation/play/play-2.6/play-2.6.gradle b/instrumentation/play/play-2.6/play-2.6.gradle
index 620c233ac474..501a9c9a991b 100644
--- a/instrumentation/play/play-2.6/play-2.6.gradle
+++ b/instrumentation/play/play-2.6/play-2.6.gradle
@@ -1,5 +1,4 @@
 ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
   // Play doesn't work with Java 9+ until 2.6.12
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
 }
diff --git a/instrumentation/ratpack-1.4/ratpack-1.4.gradle b/instrumentation/ratpack-1.4/ratpack-1.4.gradle
index 7b3da3214b68..a909758e7660 100644
--- a/instrumentation/ratpack-1.4/ratpack-1.4.gradle
+++ b/instrumentation/ratpack-1.4/ratpack-1.4.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/reactor-3.1/reactor-3.1.gradle b/instrumentation/reactor-3.1/reactor-3.1.gradle
index 47b66ffd3dfc..1e816f298b44 100644
--- a/instrumentation/reactor-3.1/reactor-3.1.gradle
+++ b/instrumentation/reactor-3.1/reactor-3.1.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/rediscala-1.8/rediscala-1.8.gradle b/instrumentation/rediscala-1.8/rediscala-1.8.gradle
index c68f92a54ec5..fb45e082ebb2 100644
--- a/instrumentation/rediscala-1.8/rediscala-1.8.gradle
+++ b/instrumentation/rediscala-1.8/rediscala-1.8.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/redisson-3.0/redisson-3.0.gradle b/instrumentation/redisson-3.0/redisson-3.0.gradle
index d0be12c58f6e..f4486d40cb42 100644
--- a/instrumentation/redisson-3.0/redisson-3.0.gradle
+++ b/instrumentation/redisson-3.0/redisson-3.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/rmi/rmi.gradle b/instrumentation/rmi/rmi.gradle
index ccb63ea2b2bd..bbe160e318b4 100644
--- a/instrumentation/rmi/rmi.gradle
+++ b/instrumentation/rmi/rmi.gradle
@@ -1,3 +1,7 @@
+ext {
+  minJavaVersionForTests = JavaVersion.VERSION_1_7
+}
+
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
@@ -14,20 +18,9 @@ task "rmic", dependsOn: testClasses {
 
 test.dependsOn "rmic"
 
-def java7Home = findJavaHome(JavaVersion.VERSION_1_7)
+//We cannot use "--release 7" javac option here because that will forbid importing "sun.rmi" package.
 tasks.withType(JavaCompile) {
   options.compilerArgs = []
-  //We don't want to force every developer to have java7 installed, so this module should build
-  //and run with any java version.
-  //But CI has must have java7 and there we want to force correct API level checks.
-  if (java7Home != null) {
-    //We cannot use "--release 7" javac option here because that will forbid importing "sun.rmi" package.
-    //But we still want to ensure that we don't use java8+ APIs.
-    //Thus we forcibly set bootstrap classloader to that of java7
-    options.fork = true
-    options.bootstrapClasspath = fileTree(include: ['*.jar'], dir: "${System.env.JAVA_7_HOME}/jre/lib/")
-    options.extensionDirs = "${System.env.JAVA_7_HOME}/jre/lib/ext/"
-  }
 }
 tasks.withType(GroovyCompile) {
   options.compilerArgs = []
diff --git a/instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle b/instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle
index f39d9d37d6b5..c3dc1a37eb5c 100644
--- a/instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle
+++ b/instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 // building against 2.3 and testing against 2.4 because JettyHandler is available since 2.4 only
diff --git a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle
index 4fb1120f0ae2..4d3306337a11 100644
--- a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle
+++ b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 group = 'io.opentelemetry.instrumentation'
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/instrumentation/spring/spring-scheduling-3.1/spring-scheduling-3.1.gradle b/instrumentation/spring/spring-scheduling-3.1/spring-scheduling-3.1.gradle
index f6526504062e..df7f5611b613 100644
--- a/instrumentation/spring/spring-scheduling-3.1/spring-scheduling-3.1.gradle
+++ b/instrumentation/spring/spring-scheduling-3.1/spring-scheduling-3.1.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle b/instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle
index 64553ab94754..b0c8d718ba74 100644
--- a/instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle
+++ b/instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle b/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle
index d767cec36b96..5851ab380f8a 100644
--- a/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle
+++ b/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
 
 dependencies {
diff --git a/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle b/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle
index bec5edb1c55e..fe5a00406563 100644
--- a/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle
+++ b/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle
@@ -1,5 +1,4 @@
 ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
   springbootVersion = "2.3.1.RELEASE"
 }
 
diff --git a/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle b/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle
index 89843d6602e3..8c94886e8127 100644
--- a/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle
+++ b/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 group = 'io.opentelemetry.instrumentation'
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/instrumentation/spring/starters/spring-starter/spring-starter.gradle b/instrumentation/spring/starters/spring-starter/spring-starter.gradle
index 854b0d1d3172..7222fa86f9e1 100644
--- a/instrumentation/spring/starters/spring-starter/spring-starter.gradle
+++ b/instrumentation/spring/starters/spring-starter/spring-starter.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 group = 'io.opentelemetry.instrumentation'
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle b/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle
index 1d2a9b33a633..913257337dd4 100644
--- a/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle
+++ b/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 group = 'io.opentelemetry.instrumentation'
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/instrumentation/vertx-3.0/vertx-3.0.gradle b/instrumentation/vertx-3.0/vertx-3.0.gradle
index 71debd5de324..c07a34b04ba9 100644
--- a/instrumentation/vertx-3.0/vertx-3.0.gradle
+++ b/instrumentation/vertx-3.0/vertx-3.0.gradle
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "${rootDir}/gradle/instrumentation.gradle"
 
 muzzle {
diff --git a/instrumentation/vertx-reactive-3.5/vertx-reactive-3.5.gradle b/instrumentation/vertx-reactive-3.5/vertx-reactive-3.5.gradle
index 4c2a5e3578b7..4c130ab1df2a 100644
--- a/instrumentation/vertx-reactive-3.5/vertx-reactive-3.5.gradle
+++ b/instrumentation/vertx-reactive-3.5/vertx-reactive-3.5.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 muzzle {