diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml index 9918eb0810d62..0567364bbde21 100644 --- a/.mvn/gradle-enterprise.xml +++ b/.mvn/gradle-enterprise.xml @@ -5,15 +5,10 @@ - - #{basedir.contains('test-classes') ? 'ON_FAILURE' : 'ALWAYS'} - - - #{basedir.contains('test-classes') ? 'TEST-BUILD' : 'MAIN-BUILD'} - + ALWAYS #{{'0.0.0.0'}} 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 6bbbc63a26463..5c59ac385689c 100644 --- a/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java +++ b/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java @@ -445,7 +445,7 @@ public static Result invokeValidateDryRunBuild(Path projectRoot) throws Exceptio public static Result invokeValidateBuild(Path projectRoot) throws Exception { Result result = execute(projectRoot, "build", "-e", "-B", "--clean", - "-Dproperty=value1", "-Dproperty2=value2"); + "-Dproperty=value1", "-Dproperty2=value2", "-Dscan=false"); Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code. Result:\n" + result); return result; diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml index ea70daeab91ff..a68f128b0d1d2 100644 --- a/independent-projects/enforcer-rules/pom.xml +++ b/independent-projects/enforcer-rules/pom.xml @@ -91,6 +91,7 @@ ${maven-invoker-plugin.version} + -Dscan=false ${project.build.directory}/it src/it/settings.xml ${project.build.directory}/local-repo diff --git a/independent-projects/extension-maven-plugin/src/test/java/io/quarkus/maven/ExtensionDescriptorMojoTest.java b/independent-projects/extension-maven-plugin/src/test/java/io/quarkus/maven/ExtensionDescriptorMojoTest.java index 19ed85e36a82e..958274569b1d0 100644 --- a/independent-projects/extension-maven-plugin/src/test/java/io/quarkus/maven/ExtensionDescriptorMojoTest.java +++ b/independent-projects/extension-maven-plugin/src/test/java/io/quarkus/maven/ExtensionDescriptorMojoTest.java @@ -299,6 +299,8 @@ private void mavenExecPom(String dir) throws MavenInvocationException { request.setPomFile(projectPath); request.setGoals(Collections.singletonList("install")); + request.addArg("-Dscan=false"); + Invoker invoker = new DefaultInvoker(); // This is a bit ugly, but bake in knowledge about where we are in the hierarchy to find maven diff --git a/integration-tests/container-image/maven-invoker-way/pom.xml b/integration-tests/container-image/maven-invoker-way/pom.xml index 4ebd245da1d13..f3723903611b3 100644 --- a/integration-tests/container-image/maven-invoker-way/pom.xml +++ b/integration-tests/container-image/maven-invoker-way/pom.xml @@ -107,6 +107,7 @@ + -Dscan=false ${project.build.directory}/it true setup diff --git a/integration-tests/istio/maven-invoker-way/pom.xml b/integration-tests/istio/maven-invoker-way/pom.xml index ebeeaeacfb9fb..cd507a2b5f0db 100644 --- a/integration-tests/istio/maven-invoker-way/pom.xml +++ b/integration-tests/istio/maven-invoker-way/pom.xml @@ -232,6 +232,7 @@ + -Dscan=false ${project.build.directory}/it true verify diff --git a/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java b/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java index 57a2c4309a832..e9df8d1e3fcae 100644 --- a/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java +++ b/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java @@ -88,6 +88,8 @@ private InvocationResult setup(Properties params) getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":create")); request.setProperties(params); request.setShowErrors(true); + disableBuildScanPublication(request); + File log = new File(testDir, "build-create-" + testDir.getName() + ".log"); PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"), InvokerLogger.DEBUG); diff --git a/integration-tests/kubernetes/maven-invoker-way/pom.xml b/integration-tests/kubernetes/maven-invoker-way/pom.xml index 582156af7b406..6ac77afefbafa 100644 --- a/integration-tests/kubernetes/maven-invoker-way/pom.xml +++ b/integration-tests/kubernetes/maven-invoker-way/pom.xml @@ -230,6 +230,7 @@ + -Dscan=false ${project.build.directory}/it true verify diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/invoker.properties b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/invoker.properties index f0dfb6e6c40a1..85623d3dd9ffd 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/invoker.properties +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/invoker.properties @@ -1,2 +1,2 @@ -# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native +# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native invoker.goals=clean package diff --git a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/invoker.properties b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/invoker.properties index bb6b843850719..15940a5393ff4 100644 --- a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/invoker.properties +++ b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/invoker.properties @@ -1,2 +1,3 @@ -# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native +# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native invoker.goals=clean package -Dquarkus.kubernetes.deploy=true +invoker.mavenOpts=-Dscan=false diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java index bc1739be9ad1f..98494a0fb741d 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java @@ -141,6 +141,7 @@ private void addExtension(boolean plural, String ext) properties.setProperty("extension", ext); } request.setProperties(properties); + disableBuildScanPublication(request); File log = new File(testDir, "build-add-extension-" + testDir.getName() + ".log"); PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"), diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateExtensionMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateExtensionMojoIT.java index ba64fbdd9b6cb..c18ab83b23822 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateExtensionMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateExtensionMojoIT.java @@ -150,6 +150,7 @@ private InvocationResult setup(Properties params) request.setDebug(false); request.setShowErrors(true); request.setProperties(params); + disableBuildScanPublication(request); File log = new File(testDir.getParent(), "build-create-extension-" + testDir.getName() + ".log"); PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"), InvokerLogger.DEBUG); diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateJBangProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateJBangProjectMojoIT.java index 66a91e9038600..0d2977c42ca05 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateJBangProjectMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateJBangProjectMojoIT.java @@ -52,6 +52,7 @@ private InvocationResult setup(Properties params) request.setDebug(false); request.setShowErrors(true); request.setProperties(params); + disableBuildScanPublication(request); File log = new File(testDir, "build-create-" + testDir.getName() + ".log"); PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"), InvokerLogger.DEBUG); diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java index c0774fd770383..5b1ffec117dee 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java @@ -57,6 +57,7 @@ public void testCodestartOutsideCatalog() throws Exception { request.setGoals(List.of("install")); request.setDebug(false); request.setShowErrors(true); + disableBuildScanPublication(request); File log = new File(testDir, "install-extension-" + testDir.getName() + ".log"); PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"), InvokerLogger.DEBUG); @@ -194,6 +195,7 @@ private InvocationResult executeCreate(Properties params) request.setDebug(false); request.setShowErrors(true); request.setProperties(params); + disableBuildScanPublication(request); PrintStreamLogger logger = getPrintStreamLogger("create-codestart.log"); invoker.setLogger(logger); diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java index 16b859cf388da..7ab71fc688b27 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java @@ -612,6 +612,7 @@ private InvocationResult setup(Properties params) request.setDebug(false); request.setShowErrors(true); request.setProperties(params); + disableBuildScanPublication(request); File log = new File(testDir, "build-create-" + testDir.getName() + ".log"); PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"), diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java index b38803df38d7e..b3d3448929720 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java @@ -64,6 +64,7 @@ private List listExtensions() request.setGoals(Collections.singletonList( getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":list-extensions")); + disableBuildScanPublication(request); File outputLog = new File(testDir, "output.log"); InvocationOutputHandler outputHandler = new PrintStreamHandler( diff --git a/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java b/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java index a532c7b3def7d..1a70df5f802f6 100644 --- a/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java +++ b/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java @@ -88,6 +88,7 @@ private InvocationResult setup(Properties params) request.setGoals(Collections.singletonList( getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":create")); request.setProperties(params); + disableBuildScanPublication(request); File log = new File(testDir, "build-create-" + testDir.getName() + ".log"); final PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"), InvokerLogger.INFO); diff --git a/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java b/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java index 011b169be0b1c..e967948cb8d7d 100644 --- a/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java +++ b/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java @@ -2,6 +2,8 @@ import java.util.Properties; +import org.apache.maven.shared.invoker.InvocationRequest; + import io.quarkus.devtools.project.QuarkusProjectHelper; import io.quarkus.platform.tools.ToolsUtils; import io.quarkus.registry.RegistryResolutionException; @@ -57,4 +59,8 @@ protected String getBomArtifactId() { protected String getBomVersion() { return getPlatformDescriptor().getBom().getVersion(); } + + protected void disableBuildScanPublication(InvocationRequest request) { + request.addArg("-Dscan=false"); + } } diff --git a/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java b/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java index 8577b26662456..94747581fd75f 100644 --- a/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java +++ b/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java @@ -135,6 +135,7 @@ public MavenProcessInvocationResult execute(List goals, Map