From 0d1098fd4158ae00218255852466369e5960301d Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Mon, 10 May 2021 09:38:32 +0200 Subject: [PATCH 1/2] Bump gradle version to 7.2 and enable Gradle EA JDK tests --- .github/workflows/ci-actions-incremental.yml | 2 +- .github/workflows/jdk-early-access-build.yml | 3 +-- build-parent/pom.xml | 2 +- .../java/io/quarkus/cli/CliProjectGradleTest.java | 2 -- .../gradle/gradle/wrapper/gradle-wrapper.properties | 2 +- devtools/project-core-extension-codestarts/pom.xml | 6 +++--- docs/src/main/asciidoc/gradle-tooling.adoc | 13 +++++++++++++ .../quarkus/tooling/gradle-wrapper/codestart.yml | 2 +- .../src/main/resources/fake-catalog.json | 2 +- independent-projects/tools/pom.xml | 2 +- .../codestarts/quarkus/QuarkusCodestartBuildIT.java | 1 - .../gradle/gradle/wrapper/gradle-wrapper.properties | 2 +- .../resources/additional-source-sets/build.gradle | 2 +- .../ext-a/deployment/build.gradle | 2 +- .../ext-a/runtime/build.gradle | 2 +- .../ext-b/deployment/build.gradle | 2 +- .../ext-b/runtime/build.gradle | 2 +- .../ext-c/deployment/build.gradle | 2 +- .../ext-c/runtime/build.gradle | 2 +- .../ext-d/deployment/build.gradle | 2 +- .../ext-d/runtime/build.gradle | 2 +- .../ext-e/deployment/build.gradle | 2 +- .../ext-e/runtime/build.gradle | 2 +- .../ext-f/deployment/build.gradle | 2 +- .../ext-f/runtime/build.gradle | 2 +- .../ext-g/deployment/build.gradle | 2 +- .../ext-g/runtime/build.gradle | 2 +- .../ext-h/deployment/build.gradle | 2 +- .../ext-h/runtime/build.gradle | 2 +- .../ext-i/deployment/build.gradle | 2 +- .../ext-i/runtime/build.gradle | 2 +- .../ext-j/deployment/build.gradle | 2 +- .../ext-j/runtime/build.gradle | 2 +- .../ext-k/deployment/build.gradle | 2 +- .../ext-k/runtime/build.gradle | 2 +- .../ext-l/deployment/build.gradle | 2 +- .../ext-l/runtime/build.gradle | 2 +- .../ext-m/deployment/build.gradle | 2 +- .../ext-m/runtime/build.gradle | 2 +- .../ext-n/deployment/build.gradle | 2 +- .../ext-n/runtime/build.gradle | 2 +- .../ext-o/deployment/build.gradle | 2 +- .../ext-o/runtime/build.gradle | 2 +- .../ext-p/deployment/build.gradle | 2 +- .../ext-p/runtime/build.gradle | 2 +- .../ext-r/deployment/build.gradle | 2 +- .../ext-r/runtime/build.gradle | 2 +- .../ext-s/deployment/build.gradle | 2 +- .../ext-s/runtime/build.gradle | 2 +- .../ext-t/deployment/build.gradle | 2 +- .../ext-t/runtime/build.gradle | 2 +- .../ext-u/deployment/build.gradle | 2 +- .../ext-u/runtime/build.gradle | 2 +- .../deployment/build.gradle | 2 +- .../runtime/build.gradle | 2 +- 55 files changed, 67 insertions(+), 58 deletions(-) diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index 130660b300b42..375315315fe8b 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -250,7 +250,7 @@ jobs: - { name: "16", java-version: 16, - maven_args: "$JVM_TEST_MAVEN_ARGS -pl '!devtools/gradle'", + maven_args: "$JVM_TEST_MAVEN_ARGS", maven_opts: "-Xmx2g -XX:MaxMetaspaceSize=1g", os-name: "ubuntu-latest" } diff --git a/.github/workflows/jdk-early-access-build.yml b/.github/workflows/jdk-early-access-build.yml index b8f43c50a9cff..d5e183b31f0b2 100644 --- a/.github/workflows/jdk-early-access-build.yml +++ b/.github/workflows/jdk-early-access-build.yml @@ -70,9 +70,8 @@ jobs: - name: Build with Maven # -fae to try to gather as many failures as possible # (but not maven.test.failure.ignore because test report generation is buggy) - # Gradle bits are excluded due to https://github.com/gradle/gradle/issues/13481 run: | - ./mvnw $JVM_TEST_MAVEN_OPTS -Dtcks install -fae -pl '!devtools/gradle' -pl '!integration-tests/gradle' + ./mvnw $JVM_TEST_MAVEN_OPTS -Dtcks install -fae # Test reports disabled due to: https://github.com/ScaCap/action-surefire-report/issues/39 #- name: Publish Test Report # if: always() diff --git a/build-parent/pom.xml b/build-parent/pom.xml index d434c7cb8fc0a..425aa8826ae26 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -59,7 +59,7 @@ 3.8.1 0.7.7 - 6.9 + 7.2 3.1 diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java index bf3d481048a72..afbc1536f5230 100644 --- a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java +++ b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import io.quarkus.cli.build.ExecuteUtil; @@ -23,7 +22,6 @@ /** * Similar to CliProjectMavenTest .. */ -@Tag("failsOnJDK16") public class CliProjectGradleTest { static final Path testProjectRoot = Paths.get(System.getProperty("user.dir")).toAbsolutePath() .resolve("target/test-project/"); diff --git a/devtools/gradle/gradle/wrapper/gradle-wrapper.properties b/devtools/gradle/gradle/wrapper/gradle-wrapper.properties index 7665b0fa93ae7..a0f7639f7d360 100644 --- a/devtools/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/devtools/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/devtools/project-core-extension-codestarts/pom.xml b/devtools/project-core-extension-codestarts/pom.xml index d5e1f30f4d239..321d70df6d863 100644 --- a/devtools/project-core-extension-codestarts/pom.xml +++ b/devtools/project-core-extension-codestarts/pom.xml @@ -44,10 +44,10 @@ -Xmx512m - wrapper + init + --type + basic --no-daemon - --gradle-version - ${gradle-wrapper.version} target/classes/gradle-wrapper true diff --git a/docs/src/main/asciidoc/gradle-tooling.adoc b/docs/src/main/asciidoc/gradle-tooling.adoc index 486d2611cb064..ab3126423dde4 100644 --- a/docs/src/main/asciidoc/gradle-tooling.adoc +++ b/docs/src/main/asciidoc/gradle-tooling.adoc @@ -494,3 +494,16 @@ More information on this topic can be found on the link:cdi-reference#bean_disco == Building with `./gradlew build` Starting from 1.1.0.Final, `./gradlew build` will no longer build the native image. Add `-Dquarkus.package.type=native` build argument explicitly as explained above if needed. + +== Publishing your application + +In order to make sure the right dependency versions are being used by Gradle, the BOM is declared as an `enforcedPlatform` in your build file. +By default, the `maven-publish` plugin will prevent you from publishing your application due to this `enforcedPlatform`. +This validation can be skipped by adding the following configuration in your `build.gradle` file: + +[source,groovy] +---- +tasks.withType(GenerateModuleMetadata).configureEach { + suppressedValidationErrors.add('enforced-platform') +} +---- \ No newline at end of file diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml index 920af7390c523..40ca2f72e6f34 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml @@ -7,7 +7,7 @@ language: base: data: gradle: - version: 6.9 + version: 7.2 shared-data: buildtool: cli: ./gradlew diff --git a/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json b/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json index 123d367189fb5..54c0097160638 100644 --- a/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json +++ b/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json @@ -314,7 +314,7 @@ "supported-maven-versions": "[3.6.2,)", "proposed-maven-version": "3.8.1", "maven-wrapper-version": "0.7.7", - "gradle-wrapper-version": "6.9" + "gradle-wrapper-version": "7.2" } }, "codestarts-artifacts": [ diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 916222c0122bf..8d6e2b7d72009 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -28,7 +28,7 @@ 3.8.1 0.7.7 - 6.9 + 7.2 diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java index 589a5ab72e54c..9b8a0084d5e00 100644 --- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java +++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java @@ -68,7 +68,6 @@ public void testRunTogetherCodestartsScala() throws Exception { @ParameterizedTest @MethodSource("provideLanguages") - @org.junit.jupiter.api.Tag("failsOnJDK16") public void testGradle(String language) throws Exception { final List codestarts = getExtensionCodestarts(); generateProjectRunTests("gradle", language, codestarts); diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties index 549d84424d021..ffed3a254e91d 100644 --- a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle b/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle index c8375ad175158..da3a9d0581ad4 100644 --- a/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle +++ b/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle @@ -28,7 +28,7 @@ sourceSets { resources.srcDir 'src/funcTest/resources' } - compileClasspath += sourceSets.main.output + configurations.testRuntimeClasspath + configurations.compileOnly + compileClasspath += sourceSets.main.output + configurations.testRuntimeClasspath runtimeClasspath += output + compileClasspath } } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/deployment/build.gradle index e1df700721ca6..910a74d91b9ea 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation("org.hibernate:hibernate-core:5.4.9") diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle index 74cd2b2fa4622..f98721e16d58b 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") api("org.hibernate:hibernate-core:5.4.9") { exclude module: "byte-buddy" } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/deployment/build.gradle index 6e3b661150ae7..f5bb098b9c208 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-b:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/runtime/build.gradle index 8e953ecb11113..3aa341d7dcfd8 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-b/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/deployment/build.gradle index dfc2d20588b21..8bb5130ba49f2 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-c:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/runtime/build.gradle index c5cc40ca08e1b..acf77bfd6a82a 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-c/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/deployment/build.gradle index f30bc1d57b5a9..9a1e1d2aa683f 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-d:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/runtime/build.gradle index df8c65101b372..a220c4dbc2b7a 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-d/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/deployment/build.gradle index 8850360dd8787..011c8f61bb3de 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-e:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/runtime/build.gradle index e30c7bce502dd..1ff4a42c23800 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-e/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/deployment/build.gradle index 7bec173ec9824..0f6024bad805f 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-f:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/runtime/build.gradle index 7e518aab9e4db..f5adf3526dee1 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-f/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation project(':ext-g:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/deployment/build.gradle index c2a80e897026c..4e839044248e5 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-g:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/runtime/build.gradle index 4c10fd21726d9..5372e8f7d889c 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-g/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/deployment/build.gradle index c047094933d88..2334a380dfec1 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-h:runtime') implementation project(':ext-k:deployment') diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/runtime/build.gradle index 6022e4348452b..dec8f131a13bd 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-h/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation project(':ext-k:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/deployment/build.gradle index 7d4af5dd45f4d..098cf5cd4cb6e 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-i:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/runtime/build.gradle index c35b697d10104..2dc10e25a07b0 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-i/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/deployment/build.gradle index da6696f68c95b..db784651b25e0 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-j:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/runtime/build.gradle index e2f225afeff7c..70877fef9490b 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-j/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/deployment/build.gradle index f70b4a9cf4f10..bf9b119032c72 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-k:runtime') implementation project(':ext-t:deployment') diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/runtime/build.gradle index 41b642a2f02de..4219c83a52706 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-k/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation project(':ext-t:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/deployment/build.gradle index 14da6329fdef9..1cfe5c47bcbe5 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-l:runtime') implementation project(':ext-j:deployment') diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/runtime/build.gradle index 7f76f32dda076..9cbd8b430dcf6 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-l/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation project(':ext-j:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/deployment/build.gradle index f779ff12f6964..1ff8de7b47534 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-m:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/runtime/build.gradle index 4c1479646966a..4936eea53c00f 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-m/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/deployment/build.gradle index 054e8aca25a87..b1942d1868a3f 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-n:runtime') implementation project(':ext-i:deployment') diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/runtime/build.gradle index a2402257025c8..788abe98ca557 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-n/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation project(':ext-i:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/deployment/build.gradle index 7ee3fddb014d4..aacb39a1d7632 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-o:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/runtime/build.gradle index d2f82db94223a..7256098019552 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-o/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/deployment/build.gradle index 206679d2f3929..cb45b41c7fc7a 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-p:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/runtime/build.gradle index b8e294edae780..72f1e487e67ed 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-p/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/deployment/build.gradle index 77d0ddb7f40eb..3cc128a70795e 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-r:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/runtime/build.gradle index c477c9e2e011f..a84867fd7cbd3 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-r/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/deployment/build.gradle index 907f6780b9c7c..f16a727889659 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-s:runtime') implementation project(':ext-u:deployment') diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/runtime/build.gradle index 3b9e7539acd78..fdff0db83cb02 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-s/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation project(':ext-u:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/deployment/build.gradle index a1a5ef492cdf1..c4be014113ab0 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-t:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/runtime/build.gradle index 567fe58820d82..2ba55f42b1e24 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-t/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/deployment/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/deployment/build.gradle index 957bcfc5e2c62..926ef34914bf0 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(':ext-u:runtime') } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/runtime/build.gradle index 3adc8ae1c1d73..cb13018ee12ec 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-u/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { diff --git a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/deployment/build.gradle b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/deployment/build.gradle index 01b7f63cca542..39b2f6cbebc96 100644 --- a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/deployment/build.gradle +++ b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/deployment/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-core-deployment' implementation project(":runtime") } diff --git a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/runtime/build.gradle b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/runtime/build.gradle index cb36290908b40..9f095cb8e494b 100644 --- a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/runtime/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation platform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") } publishing { From dca28bd5b719c905673e46d38e978220993be291 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Fri, 20 Aug 2021 10:33:58 +0200 Subject: [PATCH 2/2] Add retry to clean test files --- .../test/java/io/quarkus/cli/CliDriver.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java b/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java index 16f49c0f954ba..1e7dc5f69f9ce 100644 --- a/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java +++ b/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java @@ -137,7 +137,7 @@ public static void deleteDir(Path path) throws Exception { Files.walk(path) .sorted(Comparator.reverseOrder()) .map(Path::toFile) - .forEach(File::delete); + .forEach(f -> retryDelete(f)); Assertions.assertFalse(path.toFile().exists()); } @@ -351,4 +351,21 @@ private static String convertToProperty(String name) { } return null; } + + private static void retryDelete(File file) { + if (file.delete()) { + return; + } + int i = 0; + while (i++ < 10) { + try { + Thread.sleep(500); + } catch (InterruptedException ignored) { + + } + if (file.delete()) { + break; + } + } + } }