diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/pom.xml
similarity index 96%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/pom.xml
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/pom.xml
index f9219cab9e1..e74ba706212 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/pom.xml
@@ -11,6 +11,7 @@
4.13.1
+ 2.9
coffee.CoffeeApp
UTF-8
@@ -19,7 +20,7 @@
com.google.dagger
dagger
- 2.9
+ ${dagger.version}
org.jetbrains.kotlin
@@ -55,7 +56,7 @@
com.google.dagger
dagger-compiler
- 2.9
+ ${dagger.version}
@@ -86,7 +87,7 @@
com.google.dagger
dagger-compiler
- 2.9
+ ${dagger.version}
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/CoffeeApp.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/CoffeeApp.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/CoffeeApp.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/CoffeeApp.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/CoffeeMaker.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/CoffeeMaker.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/CoffeeMaker.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/CoffeeMaker.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/DripCoffeeModule.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/DripCoffeeModule.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/DripCoffeeModule.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/DripCoffeeModule.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/ElectricHeater.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/ElectricHeater.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/ElectricHeater.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/ElectricHeater.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/Heater.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/Heater.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/Heater.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/Heater.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/Pump.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/Pump.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/Pump.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/Pump.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/PumpModule.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/PumpModule.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/PumpModule.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/PumpModule.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/Thermosiphon.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/Thermosiphon.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/main/kotlin/Thermosiphon.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/main/kotlin/Thermosiphon.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/test/kotlin/hello/tests/ExampleTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/test/kotlin/hello/tests/ExampleTest.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/src/test/kotlin/hello/tests/ExampleTest.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/src/test/kotlin/hello/tests/ExampleTest.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/verify.bsh
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-dagger-maven-example/verify.bsh
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-dagger-maven-example/verify.bsh
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/pom.xml
similarity index 95%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/pom.xml
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/pom.xml
index 55b76b8f9cd..b3571e5bfed 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/pom.xml
@@ -11,6 +11,7 @@
4.13.1
+ 2.9
coffee.CoffeeApp
UTF-8
@@ -19,7 +20,7 @@
com.google.dagger
dagger
- 2.9
+ ${dagger.version}
org.jetbrains.kotlin
@@ -53,7 +54,7 @@
com.google.dagger
dagger-compiler
- 2.9
+ ${dagger.version}
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/AllOpenTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/AllOpenTest.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/AllOpenTest.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/AllOpenTest.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeApp.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeApp.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeApp.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeApp.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeMaker.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeMaker.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeMaker.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/CoffeeMaker.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/ElectricHeater.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/ElectricHeater.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/ElectricHeater.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/ElectricHeater.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/Heater.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/Heater.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/Heater.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/Heater.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/Pump.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/Pump.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/Pump.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/Pump.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/PumpModule.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/PumpModule.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/PumpModule.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/PumpModule.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/Thermosiphon.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/Thermosiphon.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/main/kotlin/Thermosiphon.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/main/kotlin/Thermosiphon.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/verify.bsh
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-enable-extensions-kapt-allopen/verify.bsh
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-enable-extensions-kapt-allopen/verify.bsh
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/pom.xml
similarity index 96%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/pom.xml
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/pom.xml
index 2eb8650563f..21fb411918e 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/pom.xml
@@ -11,6 +11,7 @@
4.13.1
+ 2.9
coffee.CoffeeApp
UTF-8
@@ -19,7 +20,7 @@
com.google.dagger
dagger
- 2.9
+ ${dagger.version}
org.jetbrains.kotlin
@@ -73,7 +74,7 @@
com.google.dagger
dagger-compiler
- 2.9
+ ${dagger.version}
@@ -104,7 +105,7 @@
com.google.dagger
dagger-compiler
- 2.9
+ ${dagger.version}
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/AllOpenTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/AllOpenTest.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/AllOpenTest.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/AllOpenTest.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/CoffeeApp.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/CoffeeApp.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/CoffeeApp.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/CoffeeApp.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/CoffeeMaker.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/CoffeeMaker.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/CoffeeMaker.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/CoffeeMaker.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/DripCoffeeModule.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/ElectricHeater.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/ElectricHeater.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/ElectricHeater.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/ElectricHeater.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/Heater.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/Heater.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/Heater.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/Heater.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/Pump.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/Pump.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/Pump.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/Pump.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/PumpModule.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/PumpModule.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/PumpModule.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/PumpModule.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/Thermosiphon.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/Thermosiphon.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/main/kotlin/Thermosiphon.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/main/kotlin/Thermosiphon.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/src/test/kotlin/hello/tests/ExampleTest.kt
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/verify.bsh
similarity index 100%
rename from libraries/tools/kotlin-maven-plugin-test/src/it/test-kapt-allopen/verify.bsh
rename to libraries/tools/kotlin-maven-plugin-test/src/it/java8/test-kapt-allopen/verify.bsh