diff --git a/integration-tests/gradle/pom.xml b/integration-tests/gradle/pom.xml index 04ef293f49b86..d9301122053a2 100644 --- a/integration-tests/gradle/pom.xml +++ b/integration-tests/gradle/pom.xml @@ -184,12 +184,12 @@ - - - src/test/resources + + + src/main/resources true - - + + org.apache.maven.plugins diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties index 15d78eaf882e5..41c5c0fe733b9 100644 --- a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties @@ -1,4 +1,4 @@ -kotlinVersion=1.5.30 +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle index d67f9aaa68626..28f0d81161779 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' id 'io.quarkus' - id 'org.jetbrains.kotlin.jvm' version "1.5.30" - id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30" + id 'org.jetbrains.kotlin.jvm' + id 'org.jetbrains.kotlin.plugin.allopen' } repositories { diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties index ec2b6ef199c2c..1fde479f847f8 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties @@ -1,2 +1,3 @@ +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle index 2342a44865b5c..7034c8acb938b 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle @@ -11,7 +11,9 @@ pluginManagement { } } plugins { - id 'io.quarkus' version "${quarkusPluginVersion}" + id 'io.quarkus' version "${quarkusPluginVersion}" + id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" + id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}" } } rootProject.name='code-with-quarkus' \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle index fed218e5f7b90..2ab309ef84913 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version "1.5.30" - id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30" + id 'org.jetbrains.kotlin.jvm' + id 'org.jetbrains.kotlin.plugin.allopen' id 'io.quarkus' } diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties index 8f063b7d88ba4..f4494d9c01857 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties @@ -1,2 +1,3 @@ +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle index 9fb4b0f54c909..4f8ea526e9125 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle @@ -12,7 +12,9 @@ pluginManagement { } } plugins { - id 'io.quarkus' version "${quarkusPluginVersion}" + id 'io.quarkus' version "${quarkusPluginVersion}" + id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" + id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}" } } rootProject.name='code-with-quarkus' \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties index 663c1b3b7991e..b8ff81712a497 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties @@ -3,5 +3,5 @@ quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus -kotlinVersion=1.5.30 +kotlinVersion=${kotlin.version} diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle index d7466be3bc153..349362885e842 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.jetbrains.kotlin.jvm' version "1.5.30" - id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30" + id 'org.jetbrains.kotlin.jvm' + id 'org.jetbrains.kotlin.plugin.allopen' id 'io.quarkus' } diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties b/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties index 8f063b7d88ba4..f4494d9c01857 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties @@ -1,2 +1,3 @@ +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle index 9fb4b0f54c909..4f8ea526e9125 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle +++ b/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle @@ -12,7 +12,9 @@ pluginManagement { } } plugins { - id 'io.quarkus' version "${quarkusPluginVersion}" + id 'io.quarkus' version "${quarkusPluginVersion}" + id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" + id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}" } } rootProject.name='code-with-quarkus' \ No newline at end of file