diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java index f24ba2fd7bfc1..3cbe292a417fb 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java @@ -37,6 +37,8 @@ import org.apache.maven.shared.invoker.MavenInvocationException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import io.quarkus.bootstrap.model.CapabilityErrors; import io.quarkus.devui.tests.DevUIJsonRPCTest; @@ -310,7 +312,8 @@ public void testThatTheApplicationIsReloadedOnJavaChange() throws MavenInvocatio // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); await() .pollDelay(100, TimeUnit.MILLISECONDS) @@ -322,7 +325,8 @@ public void testThatTheApplicationIsReloadedOnJavaChange() throws MavenInvocatio // Wait until we get "carambar" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); } @Test @@ -359,7 +363,8 @@ public void testThatNonExistentSrcDirCanBeAdded() throws MavenInvocationExceptio // Wait until we get "hello" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello")); } @Test @@ -381,7 +386,8 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); //verify that this was an instrumentation based reload Assertions.assertEquals(firstUuid, devModeClient.getHttpResponse("/app/uuid")); @@ -392,7 +398,7 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce // Wait until we get "Stuart Douglas" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/name").contains("Stuart Douglas")); //this bean observes startup event, so it should be different UUID @@ -408,7 +414,8 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce // Wait until we get "hello" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello")); //verify that this was not instrumentation based reload Assertions.assertNotEquals(secondUUid, devModeClient.getHttpResponse("/app/uuid")); @@ -423,7 +430,8 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce // Wait until we get uuid await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); //verify that this was an instrumentation based reload Assertions.assertEquals(secondUUid, devModeClient.getHttpResponse("/app/uuid")); @@ -440,7 +448,8 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce // Wait until we get "hello" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello")); //verify that this was not instrumentation based reload Assertions.assertNotEquals(secondUUid, devModeClient.getHttpResponse("/app/uuid")); @@ -451,7 +460,7 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce @Test public void testThatSourceChangesAreDetectedOnPomChange() throws Exception { testDir = initProject("projects/classic", "projects/project-classic-run-src-and-pom-change"); - runAndCheck(); + runAndCheck(false); // Edit a Java file too final File javaSource = new File(testDir, "src/main/java/org/acme/HelloResource.java"); @@ -473,12 +482,15 @@ public void testThatSourceChangesAreDetectedOnPomChange() throws Exception { // Wait until we get the updated responses await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) - .until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello " + uuid)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> { + System.out.println(devModeClient.getHttpResponse("/app/hello")); + return devModeClient.getHttpResponse("/app/hello").contains("hello " + uuid); + }); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greeting").contains(uuid)); } @@ -528,7 +540,8 @@ public void testThatTheApplicationIsReloadedOnPomChange() throws MavenInvocation // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/q/openapi").contains("hello")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/q/openapi").contains("hello")); } @Test @@ -603,7 +616,8 @@ public void testThatTheApplicationIsReloadedMultiModule() throws MavenInvocation // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); await() .pollDelay(100, TimeUnit.MILLISECONDS) @@ -630,7 +644,8 @@ public void testThatTheApplicationIsReloadedMultiModule() throws MavenInvocation // Wait until we get "carambar" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); // Create a new resource source = new File(testDir, "html/src/main/resources/META-INF/resources/lorem.txt"); @@ -639,21 +654,21 @@ public void testThatTheApplicationIsReloadedMultiModule() throws MavenInvocation "UTF-8"); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt").contains("Lorem ipsum")); // Update the resource FileUtils.write(source, uuid, "UTF-8"); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt").contains(uuid)); // Delete the resource source.delete(); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt", 404)); } @@ -677,7 +692,7 @@ public void testMultiModuleDevModeWithLocalDepsDisabled() throws MavenInvocation // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greeting").contains(uuid)); greeting = devModeClient.getHttpResponse("/app/hello"); @@ -699,7 +714,8 @@ public void testMultiModuleProjectWithRevisionVersion() throws MavenInvocationEx // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); await() .pollDelay(100, TimeUnit.MILLISECONDS) @@ -744,7 +760,8 @@ public void testThatTheApplicationIsReloadedOnNewResource() throws MavenInvocati // Wait until we get "bar" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/foo").contains("bar")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/foo").contains("bar")); } @Test @@ -779,7 +796,7 @@ public void testThatClassFileAreCleanedUp() throws MavenInvocationException, IOE // Wait until source file is compiled await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/deletion").contains("to be deleted")); // Remove InnerClass @@ -792,7 +809,7 @@ public void testThatClassFileAreCleanedUp() throws MavenInvocationException, IOE // Make sure that other class files have not been deleted. await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); // Verify that only ClassDeletionResource$InnerClass.class to be deleted @@ -806,7 +823,7 @@ public void testThatClassFileAreCleanedUp() throws MavenInvocationException, IOE // Wait until we get "404 Not Found" because ClassDeletionResource.class have been deleted. await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/deletion", 404)); // Make sure that class files for the deleted source file have also been deleted @@ -859,7 +876,7 @@ public void testThatTheApplicationIsReloadedOnConfigChange() throws MavenInvocat // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greeting").contains(uuid)); } @@ -938,7 +955,7 @@ public void testThatNewResourcesAreServed() throws MavenInvocationException, IOE "UTF-8"); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt"), containsString("Lorem ipsum")); // Update the resource @@ -946,14 +963,14 @@ public void testThatNewResourcesAreServed() throws MavenInvocationException, IOE FileUtils.write(source, uuid, "UTF-8"); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt"), equalTo(uuid)); // Delete the resource source.delete(); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt", 404)); } @@ -964,7 +981,7 @@ public void testThatConfigFileDeletionsAreDetected() throws MavenInvocationExcep await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greetings").contains("Bonjour")); File source = new File(testDir, "src/main/resources/application.properties"); @@ -972,7 +989,7 @@ public void testThatConfigFileDeletionsAreDetected() throws MavenInvocationExcep await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greetings").contains("Guten Morgen")); } @@ -992,7 +1009,7 @@ private void testMultipleResourceDirectories() throws MavenInvocationException, runAndCheck(); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greetings").contains("Bonjour/Other")); // Update the application.properties @@ -1000,7 +1017,7 @@ private void testMultipleResourceDirectories() throws MavenInvocationException, FileUtils.write(source, "greeting=Salut", "UTF-8"); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greetings").contains("Salut/Other")); // Add the application.yaml @@ -1009,7 +1026,7 @@ private void testMultipleResourceDirectories() throws MavenInvocationException, " greeting: Buenos dias", "UTF-8"); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greetings").contains("Salut/Buenos dias")); // Update the application.yaml @@ -1017,7 +1034,7 @@ private void testMultipleResourceDirectories() throws MavenInvocationException, " greeting: Hola", "UTF-8"); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greetings").contains("Salut/Hola")); } @@ -1035,7 +1052,7 @@ public void testThatApplicationRecoversCompilationIssue() throws MavenInvocation AtomicReference last = new AtomicReference<>(); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String content = devModeClient.getHttpResponse("/app/hello", true); last.set(content); return content.contains(uuid); @@ -1054,7 +1071,8 @@ public void testThatApplicationRecoversCompilationIssue() throws MavenInvocation // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); } @Test @@ -1070,7 +1088,7 @@ public void testThatApplicationRecoversStartupIssue() throws MavenInvocationExce AtomicReference last = new AtomicReference<>(); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String content = devModeClient.getHttpResponse("/app/hello", true); last.set(content); return content.contains("Error restarting Quarkus"); @@ -1082,7 +1100,7 @@ public void testThatApplicationRecoversStartupIssue() throws MavenInvocationExce await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String content = devModeClient.getHttpResponse("/app/hello", true); last.set(content); return content.equals("hello"); @@ -1119,7 +1137,8 @@ public void testThatNewBeanAreDiscovered() throws IOException, MavenInvocationEx // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("message")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("message")); await() .pollDelay(100, TimeUnit.MILLISECONDS) @@ -1130,7 +1149,8 @@ public void testThatNewBeanAreDiscovered() throws IOException, MavenInvocationEx await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("foobarbaz")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("foobarbaz")); } @Test @@ -1181,7 +1201,7 @@ public void testThatTheApplicationIsReloadedOnDotEnvConfigChange() throws MavenI // Wait until we get "uuid" await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/otherGreeting").contains(uuid)); } @@ -1232,7 +1252,7 @@ public void testResourcesFromClasspath() throws MavenInvocationException, IOExce // make sure the application starts await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/cp/hello").equals("hello")); // test that we don't get multiple instances of a resource when loading from the ClassLoader @@ -1275,7 +1295,7 @@ public void testModuleCompileOrder() throws IOException, MavenInvocationExceptio await() .pollDelay(300, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello").contains("hello world")); } @@ -1312,7 +1332,7 @@ public void testMultiJarModuleDevModeMocks() throws MavenInvocationException, IO filter(resource, Collections.singletonMap("return \"mock-service\";", "return \"mock-service!\";")); await() .pollDelay(300, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("acme other mock-service!")); // Update AcmeBean @@ -1320,7 +1340,7 @@ public void testMultiJarModuleDevModeMocks() throws MavenInvocationException, IO filter(resource, Collections.singletonMap("return \"acme\";", "return \"acme!\";")); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("acme! other mock-service!")); // Update Other bean @@ -1328,7 +1348,7 @@ public void testMultiJarModuleDevModeMocks() throws MavenInvocationException, IO filter(resource, Collections.singletonMap("return \"other\";", "return \"other!\";")); await() .pollDelay(300, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("acme! other! mock-service!")); } @@ -1345,7 +1365,7 @@ public void testMultiJarModuleDevMode() throws MavenInvocationException, IOExcep filter(resource, Collections.singletonMap("return \"acme-service\";", "return \"acme-service!\";")); await() .pollDelay(300, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("acme other acme-service!")); // Update AcmeBean @@ -1353,7 +1373,7 @@ public void testMultiJarModuleDevMode() throws MavenInvocationException, IOExcep filter(resource, Collections.singletonMap("return \"acme\";", "return \"acme!\";")); await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("acme! other acme-service!")); // Update Other bean @@ -1361,7 +1381,7 @@ public void testMultiJarModuleDevMode() throws MavenInvocationException, IOExcep filter(resource, Collections.singletonMap("return \"other\";", "return \"other!\";")); await() .pollDelay(300, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("acme! other! acme-service!")); } @@ -1374,7 +1394,7 @@ public void testThatWatchedAbsolutePathsAreNotDeleted() throws MavenInvocationEx await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("Servus")); // Update the .env @@ -1385,13 +1405,14 @@ public void testThatWatchedAbsolutePathsAreNotDeleted() throws MavenInvocationEx await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("Hallo")); assertTrue(source.exists()); } @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Installing the library again is failing on Windows, probably because the jar is accessed by the dev mode process") public void testExternalReloadableArtifacts() throws Exception { final String rootProjectPath = "projects/external-reloadable-artifacts"; @@ -1409,7 +1430,7 @@ public void testExternalReloadableArtifacts() throws Exception { await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("Hello")); final File greetingJava = externalJarDir.toPath().resolve("src").resolve("main") @@ -1432,7 +1453,7 @@ public void testExternalReloadableArtifacts() throws Exception { await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("Bonjour")); // Change bonjour() method content in Greeting.java @@ -1444,7 +1465,7 @@ public void testExternalReloadableArtifacts() throws Exception { await() .pollDelay(100, TimeUnit.MILLISECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/hello").contains("BONJOUR!")); } } diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java index 8a78cf9d62afd..2c7a2a8405352 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java @@ -37,8 +37,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.condition.OS; import io.quarkus.deployment.pkg.steps.JarResultBuildStep; import io.quarkus.deployment.util.IoUtil; @@ -60,13 +62,15 @@ public class JarRunnerIT extends MojoTestBase { * @see */ @Test + @DisabledOnOs(value = OS.WINDOWS, disabledReason = "With maven-compiler-plugin 2.11.0, this test is not working anymore on Windows: Error while storing the mojo status: Input length = 1") public void testNonAsciiDir() throws Exception { final File testDir = initProject("projects/classic", "projects/ěščřžýáíéůú"); final RunningInvoker running = new RunningInvoker(testDir, false); final MavenProcessInvocationResult result = running.execute(Arrays.asList("install", "-DskipTests"), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -79,7 +83,8 @@ public void testNonAsciiDir() throws Exception { // Wait until server up dumpFileContentOnFailure(() -> { await().pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); return null; }, output, ConditionTimeoutException.class); } finally { @@ -94,7 +99,8 @@ public void testThatJarRunnerConsoleOutputWorksCorrectly() throws MavenInvocatio RunningInvoker running = new RunningInvoker(testDir, false); MavenProcessInvocationResult result = running.execute(Arrays.asList("package", "-DskipTests"), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -108,7 +114,8 @@ public void testThatJarRunnerConsoleOutputWorksCorrectly() throws MavenInvocatio // Wait until server up await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); String logs = FileUtils.readFileToString(output, "UTF-8"); @@ -132,7 +139,8 @@ public void testPlatformPropertiesOverridenInApplicationProperties() throws Exce final MavenProcessInvocationResult result = running.execute(Arrays.asList("install"), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -157,7 +165,8 @@ public void testPlatformPropertiesOverridenOnCommandLine() throws Exception { final MavenProcessInvocationResult result = running.execute( Arrays.asList("install -Dquarkus.native.builder-image=commandline -DskipTests"), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -203,7 +212,8 @@ public void testThatLegacyJarFormatWorks() throws Exception { "-DskipTests", "-Dquarkus.package.type=legacy-jar"), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -238,7 +248,8 @@ public void testThatLegacyJarFormatWorks() throws Exception { dumpFileContentOnFailure(() -> { await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); return null; }, output, ConditionTimeoutException.class); @@ -264,7 +275,8 @@ public void reaugmentationWithRemovedArtifacts() throws Exception { MavenProcessInvocationResult result = running .execute(List.of("package", "-DskipTests", "-Dquarkus.package.type=mutable-jar", "-Dquarkus.analytics.disabled=true"), Map.of()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -281,7 +293,7 @@ public void reaugmentationWithRemovedArtifacts() throws Exception { AtomicReference response = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/cp/resourceCount/entry", false); response.set(ret); return true; @@ -309,7 +321,7 @@ public void reaugmentationWithRemovedArtifacts() throws Exception { AtomicReference response = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/cp/resourceCount/entry", false); response.set(ret); return true; @@ -334,7 +346,7 @@ public void reaugmentationWithRemovedArtifacts() throws Exception { AtomicReference response = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/cp/resourceCount/entry", false); response.set(ret); return true; @@ -357,7 +369,8 @@ public void reaugmentationWithRemovedArtifactsUsingSystemProperties() throws Exc // The default build MavenProcessInvocationResult result = running .execute(List.of("package", "-DskipTests", "-Dquarkus.package.type=mutable-jar"), Map.of()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -374,7 +387,7 @@ public void reaugmentationWithRemovedArtifactsUsingSystemProperties() throws Exc AtomicReference response = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/words/runtime", false); response.set(ret); return true; @@ -383,7 +396,7 @@ public void reaugmentationWithRemovedArtifactsUsingSystemProperties() throws Exc await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/words/buildtime", false); response.set(ret); return true; @@ -409,7 +422,7 @@ public void reaugmentationWithRemovedArtifactsUsingSystemProperties() throws Exc AtomicReference response = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/words/runtime", false); response.set(ret); return true; @@ -418,7 +431,7 @@ public void reaugmentationWithRemovedArtifactsUsingSystemProperties() throws Exc await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/words/buildtime", false); response.set(ret); return true; @@ -441,7 +454,7 @@ public void reaugmentationWithRemovedArtifactsUsingSystemProperties() throws Exc AtomicReference response = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/words/runtime", false); response.set(ret); return true; @@ -450,7 +463,7 @@ public void reaugmentationWithRemovedArtifactsUsingSystemProperties() throws Exc await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/words/buildtime", false); response.set(ret); return true; @@ -470,7 +483,8 @@ private void assertThatMutableFastJarWorks(String targetDirSuffix, String provid .execute(Arrays.asList("package", "-DskipTests", "-Dquarkus.package.type=mutable-jar", "-Dquarkus.package.user-providers-directory=" + providersDir), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -495,7 +509,8 @@ private void assertThatMutableFastJarWorks(String targetDirSuffix, String provid dumpFileContentOnFailure(() -> { await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); return null; }, output, ConditionTimeoutException.class); performRequest("/app/added", 404); @@ -532,7 +547,8 @@ private void assertThatMutableFastJarWorks(String targetDirSuffix, String provid // Wait until server up await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/moved/app/hello/package", 200)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/moved/app/hello/package", 200)); String logs = FileUtils.readFileToString(output, "UTF-8"); @@ -570,7 +586,7 @@ private void assertThatMutableFastJarWorks(String targetDirSuffix, String provid // Wait until server up await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/anothermove/app/hello/package", 200)); String logs = FileUtils.readFileToString(output, "UTF-8"); @@ -599,7 +615,8 @@ public void testThatAppCDSAreUsable() throws Exception { .execute(Arrays.asList("package", "-DskipTests", "-Dquarkus.package.create-appcds=true"), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -617,8 +634,9 @@ public void testThatAppCDSAreUsable() throws Exception { // Wait until server up dumpFileContentOnFailure(() -> { await() - .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); + .pollDelay(10, TimeUnit.SECONDS) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); return null; }, output, ConditionTimeoutException.class); @@ -640,7 +658,8 @@ public void testArcExcludeDependencyOnLocalModule() throws Exception { RunningInvoker running = new RunningInvoker(testDir, false); MavenProcessInvocationResult result = running.execute(Arrays.asList("package", "-DskipTests"), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -656,7 +675,7 @@ public void testArcExcludeDependencyOnLocalModule() throws Exception { AtomicReference response = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String ret = devModeClient.getHttpResponse("/hello", true); response.set(ret); return ret.contains("hello:"); @@ -798,7 +817,8 @@ private void assertThatFastJarFormatWorks(String outputDir) throws Exception { "-Dquarkus.package.type=fast-jar", outputDir == null ? "" : "-Dquarkus.package.output-directory=" + outputDir), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive()); + await().atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> result.getProcess() != null && !result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS"); running.stop(); @@ -827,7 +847,8 @@ private void assertThatFastJarFormatWorks(String outputDir) throws Exception { dumpFileContentOnFailure(() -> { await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello/package", 200)); return null; }, output, ConditionTimeoutException.class); diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusITBase.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusITBase.java index 77db092b14410..08c98d3e4e16e 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusITBase.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusITBase.java @@ -25,7 +25,7 @@ void doTest(String projectName, String profile) throws MavenInvocationException, .execute(Arrays.asList("package", "-B", "-D" + profile), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES) + await().atMost(3, TimeUnit.MINUTES) .until(() -> packageInvocationResult.getProcess() != null && !packageInvocationResult.getProcess().isAlive()); assertThat(packageInvocation.log()).containsIgnoringCase("BUILD SUCCESS"); @@ -35,7 +35,7 @@ void doTest(String projectName, String profile) throws MavenInvocationException, .execute(Arrays.asList("failsafe:integration-test", "-B", "-D" + profile), Collections.emptyMap()); - await().atMost(1, TimeUnit.MINUTES) + await().atMost(3, TimeUnit.MINUTES) .until(() -> integrationTestsInvocationResult.getProcess() != null && !integrationTestsInvocationResult.getProcess().isAlive()); assertThat(integrationTestsInvocation.log()).containsIgnoringCase("BUILD SUCCESS"); diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java index ffd8cd2feb30a..cecbab77e76c3 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java @@ -40,7 +40,8 @@ public void testThatTheApplicationIsReloadedOnJavaChange() // Wait until we get "uuid" await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains(uuid)); await() .pollDelay(1, TimeUnit.SECONDS) @@ -52,7 +53,8 @@ public void testThatTheApplicationIsReloadedOnJavaChange() // Wait until we get "carambar" await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); //also verify that the dev ui console is disabled devModeClient.getHttpResponse("/q/dev-v1", 404, 10, TimeUnit.SECONDS); @@ -87,7 +89,8 @@ public void testThatTheApplicationIsReloadedOnNewResource() throws MavenInvocati // Wait until we get "bar" await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/foo").contains("bar")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/foo").contains("bar")); } @Test @@ -119,7 +122,7 @@ public void testThatTheApplicationIsReloadedOnConfigChange() throws MavenInvocat // Wait until we get "uuid" await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/app/hello/greeting").contains(uuid)); } @@ -137,7 +140,7 @@ public void testThatNewResourcesAreServed() throws MavenInvocationException, IOE "UTF-8"); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt").contains("Lorem ipsum")); // Update the resource @@ -145,7 +148,7 @@ public void testThatNewResourcesAreServed() throws MavenInvocationException, IOE FileUtils.write(source, uuid, "UTF-8"); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES) + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) .until(() -> devModeClient.getHttpResponse("/lorem.txt").contains(uuid)); // Delete the resource @@ -153,7 +156,7 @@ public void testThatNewResourcesAreServed() throws MavenInvocationException, IOE // source.delete(); // await() // .pollDelay(1, TimeUnit.SECONDS) - // .atMost(1, TimeUnit.MINUTES) + // .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) // .until(() -> getHttpResponse("/lorem.txt", 404)); } @@ -172,7 +175,7 @@ public void testThatApplicationRecoversCompilationIssue() throws MavenInvocation AtomicReference last = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> { + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES).until(() -> { String content = devModeClient.getHttpResponse("/app/hello", true); last.set(content); return content.contains(uuid); @@ -191,7 +194,8 @@ public void testThatApplicationRecoversCompilationIssue() throws MavenInvocation // Wait until we get "uuid" await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("carambar")); } @Test @@ -224,7 +228,8 @@ public void testThatNewBeanAreDiscovered() throws IOException, MavenInvocationEx // Wait until we get "uuid" await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("message")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("message")); await() .pollDelay(1, TimeUnit.SECONDS) @@ -235,7 +240,8 @@ public void testThatNewBeanAreDiscovered() throws IOException, MavenInvocationEx await() .pollDelay(1, TimeUnit.SECONDS) - .atMost(1, TimeUnit.MINUTES).until(() -> devModeClient.getHttpResponse("/app/hello").contains("foobarbaz")); + .atMost(TestUtils.getDefaultTimeout(), TimeUnit.MINUTES) + .until(() -> devModeClient.getHttpResponse("/app/hello").contains("foobarbaz")); } } diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/TestUtils.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/TestUtils.java new file mode 100644 index 0000000000000..c9d76849403e7 --- /dev/null +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/TestUtils.java @@ -0,0 +1,15 @@ +package io.quarkus.maven.it; + +import io.smallrye.common.os.OS; + +final class TestUtils { + + private static final long DEFAULT_TIMEOUT = OS.current() == OS.WINDOWS ? 3L : 1L; + + private TestUtils() { + } + + static long getDefaultTimeout() { + return DEFAULT_TIMEOUT; + } +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml index c962751b8d33f..1ba5c8254b353 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.acme @@ -12,10 +13,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${version.surefire.plugin} + ${compiler-plugin.version} UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} library @@ -23,13 +25,19 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + maven-compiler-plugin + \${compiler-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml index f1847800e8234..34787b9b87cc5 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -38,6 +39,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/pom.xml index 7cd392b69ee06..5e1f135283e30 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/pom.xml @@ -11,9 +11,10 @@ @project.version@ bar @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -36,6 +37,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/pom.xml index 2f8d9c0c071a0..5b31f004d0807 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/pom.xml @@ -11,9 +11,10 @@ @project.version@ foo @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -36,6 +37,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/acme-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/acme-ext/pom.xml index 7f64b75e7a3dc..16218e93854a5 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/acme-ext/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/acme-ext/pom.xml @@ -18,11 +18,11 @@ UTF-8 UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} true @project.version@ - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/alt-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/alt-ext/pom.xml index eb7283171217b..3b5c066629b33 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/alt-ext/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/alt-ext/pom.xml @@ -18,11 +18,11 @@ UTF-8 UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} true @project.version@ - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml index ff3573ccab27d..5e1655d3b6d6c 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml @@ -12,10 +12,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${version.surefire.plugin} + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 acme-ext @@ -24,13 +25,19 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/acme-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/acme-ext/pom.xml index 7f64b75e7a3dc..16218e93854a5 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/acme-ext/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/acme-ext/pom.xml @@ -18,11 +18,11 @@ UTF-8 UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} true @project.version@ - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/alt-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/alt-ext/pom.xml index eb7283171217b..3b5c066629b33 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/alt-ext/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/alt-ext/pom.xml @@ -18,11 +18,11 @@ UTF-8 UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} true @project.version@ - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml index ff3573ccab27d..5e1655d3b6d6c 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml @@ -12,10 +12,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${version.surefire.plugin} + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 acme-ext @@ -24,13 +25,19 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml index 1220101b8b181..e9eda31abf992 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml @@ -10,9 +10,10 @@ quarkus-bom 2.14.3.Final 2.14.3.Final - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 1.13.0 @@ -65,6 +66,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml index e8f5969492df1..9f2edd4e46ed9 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -58,6 +59,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml index 1590a9aab46af..9ca9fd29ad3f0 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -49,6 +50,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml index f2e13abb6ccc6..545a6ecee847d 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml @@ -10,9 +10,11 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven-resources-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -49,9 +51,13 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + maven-resources-plugin - 3.1.0 + \${resources-plugin.version} zip diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml index 54de5cff41fbd..34a6ed46068ab 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -43,6 +44,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml index 79600f2513215..43f7bc5aff4e0 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} UTF-8 - 11 + ${maven.compiler.target} @@ -53,6 +54,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml index 9b3f767256db5..f43def6d5eaae 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -54,6 +55,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml index 41aaa9de012bf..8de0b59f56073 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml @@ -10,9 +10,11 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven-resources-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 bonjour @@ -52,13 +54,17 @@ maven-resources-plugin - 3.1.0 + \${resources-plugin.version} zip + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml index 0ff4cfd54da4b..4b61b466dfe8e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} UTF-8 - 11 + ${maven.compiler.source} + ${maven.compiler.target} 1.13.0 @@ -70,6 +71,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/pom.xml index 2def1609464c0..c52587a1d97da 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 1.0.1 @@ -45,6 +46,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/pom.xml index 6bfb6e7b5b467..6916e694ca2cb 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/pom.xml @@ -8,14 +8,14 @@ pom Acme - Parent - 3.8.1 - 11 + ${compiler-plugin.version} + ${maven.compiler.release} UTF-8 UTF-8 quarkus-bom io.quarkus @project.version@ - 3.1.2 + ${version.surefire.plugin} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml index b8282f4c839ff..9621f03c8f1d0 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 uber-jar @@ -39,6 +40,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml index 362c1fd6ecc3d..e5011b29d1e48 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml @@ -13,13 +13,13 @@ @project.version@ @project.version@ @project.version@ - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} true - 3.8.1 + ${compiler-plugin.version} UTF-8 UTF-8 - 3.1.2 + ${version.surefire.plugin} quarkus-ext-a diff --git a/integration-tests/maven/src/test/resources-filtered/projects/create-extension-pom/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/create-extension-pom/pom.xml index bb16170093f89..88a4608c4ac5e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/create-extension-pom/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/create-extension-pom/pom.xml @@ -9,7 +9,7 @@ 1.6.0.Final 3.3.0 - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/create-extension-quarkus-core/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/create-extension-quarkus-core/pom.xml index 6a4039cbd3fc7..2684d7164cc0d 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/create-extension-quarkus-core/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/create-extension-quarkus-core/pom.xml @@ -15,7 +15,7 @@ pom 3.3.0 - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml index cebf5d9b04250..aed9147dbb6a9 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -45,6 +46,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-app/pom.xml index 405a280658774..ee05c9fc8f3ff 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-app/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-app/pom.xml @@ -14,8 +14,9 @@ quarkus-bom @project.version@ @project.version@ - 11 - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} @@ -32,6 +33,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-plugin/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-plugin/pom.xml index 568c88ff89729..8e85aa77f2cf0 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-plugin/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/custom-packaging-plugin/pom.xml @@ -15,8 +15,9 @@ quarkus-bom @project.version@ @project.version@ - 11 - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} @@ -33,6 +34,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + maven-plugin-plugin 3.7.1 diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml index e8e86808bcb55..d2569a9a2ed29 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -51,6 +52,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/pom.xml index f483b50f22730..f6c91f57a42a3 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -35,6 +36,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml index bc238ff458ed2..b4e1bf6b98b87 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -50,6 +51,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml index 738fc445e4ee7..c6de690016a77 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -54,6 +55,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml index add2b01f17ed5..7d414ec7ee852 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -57,6 +58,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/pom.xml index a2774c42bff7d..def933823128e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -35,6 +36,10 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-codestart/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/extension-codestart/pom.xml index 0147d903bf770..2931882b75b03 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/extension-codestart/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-codestart/pom.xml @@ -12,8 +12,8 @@ runtime - 3.8.1 - 11 + ${compiler-plugin.version} + ${maven.compiler.release} UTF-8 UTF-8 @project.version@ diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml index 448a1ce93a63a..55035546eb0b8 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml @@ -7,14 +7,15 @@ code-with-quarkus 1.0.0-SNAPSHOT - 3.8.1 - 11 + ${compiler-plugin.version} + ${maven.compiler.release} UTF-8 UTF-8 quarkus-bom io.quarkus @project.version@ - 3.1.2 + ${version.surefire.plugin} + ${compiler-plugin.version} @@ -51,12 +52,18 @@ runner - - - io.quarkus - quarkus-maven-plugin - \${quarkus.platform.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + io.quarkus + quarkus-maven-plugin + \${quarkus.platform.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/pom.xml index 2b6b184aa85d5..72ebb3986f96e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/pom.xml @@ -13,13 +13,13 @@ integration-tests - 3.8.1 + ${compiler-plugin.version} \${surefire-plugin.version} - 11 + ${maven.compiler.release} UTF-8 UTF-8 @project.version@ - 3.1.2 + ${version.surefire.plugin} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/pom.xml index 0f91d28dc1a69..9275e454ae409 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/pom.xml @@ -1,6 +1,8 @@ - + 4.0.0 org.acme @@ -12,9 +14,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -44,6 +47,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/external-lib/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/external-lib/pom.xml index 4eee0562b1a85..cdd4d67673eac 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/external-lib/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/external-lib/pom.xml @@ -8,14 +8,24 @@ 1.0-SNAPSHOT - 11 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 3.2.2 + ${compiler-plugin.version} + ${version.jar.plugin} + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + org.apache.maven.plugins maven-jar-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/pom.xml index 7cb6123cf526b..f3753c24ee279 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 uber-jar @@ -40,6 +41,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml index 90d8b8a8f8701..1b4f9a9a3d2e7 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml @@ -12,10 +12,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 runner @@ -24,6 +25,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/pom.xml index 0f05862b0802d..1ee66c5e58117 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/pom.xml @@ -9,12 +9,21 @@ 4.0.0 module-1 - 11 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/pom.xml index a115bbb4f947d..89739aef3cc1b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/pom.xml @@ -9,12 +9,21 @@ 4.0.0 module-2 - 11 + ${maven.compiler.source} UTF-8 - 11 + ${maven.compiler.target} + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml index 8b498fb58d8bc..aa7abffb91a44 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml @@ -11,10 +11,11 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${maven.compiler.source} UTF-8 - 11 - 3.1.2 + ${maven.compiler.target} + ${version.surefire.plugin} + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml index 3503214b3c826..aa1aa8f313096 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml @@ -10,10 +10,11 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} 4.4 1.3.2 @@ -60,6 +61,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml index cb2a1350cd458..7f9e82a9fbd4a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml @@ -14,10 +14,12 @@ io.quarkus quarkus-bom @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} + ${version.jar.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 beans @@ -29,10 +31,19 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + org.apache.maven.plugins maven-jar-plugin - 3.2.0 + ${jar-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml index fb0fa37fabba4..298165afd7821 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 cp.acme @@ -8,14 +9,15 @@ pom - io.quarkus - quarkus-bom - @project.version@ - @project.version@ - 3.1.2 + io.quarkus + quarkus-bom + @project.version@ + @project.version@ + ${version.surefire.plugin} + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 rest @@ -25,13 +27,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml index 4e374e5a4eb1f..10450a0ca875f 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.acme @@ -12,10 +13,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 level0 diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml index 643ef2070a46c..ef843750dca80 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.acme @@ -13,10 +14,11 @@ quarkus-bom \${project.version} \${project.version} - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 rest @@ -25,13 +27,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/pom.xml index 77d76ec64b855..7288fb6ea06d6 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.acme @@ -8,14 +9,15 @@ pom - io.quarkus - quarkus-bom - @project.version@ - @project.version@ - 2.22.1 + io.quarkus + quarkus-bom + @project.version@ + @project.version@ + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 rest @@ -24,13 +26,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml index 1a92fdfe06aba..7288fb6ea06d6 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.acme @@ -8,14 +9,15 @@ pom - io.quarkus - quarkus-bom - @project.version@ - @project.version@ - 3.1.2 + io.quarkus + quarkus-bom + @project.version@ + @project.version@ + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 rest @@ -24,13 +26,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/pom.xml index c0de7ebee4af0..17d393642168a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -34,6 +35,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/pom.xml index 930fdd57a3fd5..d92f8c757d6b3 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -35,6 +36,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/pom.xml index cfb18815639af..d91a6f460964d 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/pom.xml @@ -7,17 +7,17 @@ 1.0-SNAPSHOT pom - 3.8.1 + ${compiler-plugin.version} true - 8 - 8 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 UTF-8 quarkus-bom io.quarkus @project.version@ @project.version@ - 2.22.1 + ${version.surefire.plugin} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/pom-in-target-dir/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/pom-in-target-dir/pom.xml index e7a2ccb3e3954..159b773fbf4da 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/pom-in-target-dir/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/pom-in-target-dir/pom.xml @@ -7,7 +7,7 @@ 1.0.0-SNAPSHOT ${compiler-plugin.version} - 11 + ${maven.compiler.release} UTF-8 UTF-8 quarkus-bom diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml index 642404279daab..7e7459518dbb8 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml @@ -12,10 +12,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 common @@ -26,13 +27,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/pom.xml index 7f64b75e7a3dc..16218e93854a5 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/pom.xml @@ -18,11 +18,11 @@ UTF-8 UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} true @project.version@ - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml index 1987b29dd1ac1..4639f3f825177 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 myapp \${expansion.application.name} @@ -56,25 +57,34 @@ - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - regex-property - validate - - regex-property - - - expansion.image.tag - tag - tag - tag - false - - - + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + regex-property + validate + + regex-property + + + expansion.image.tag + tag + tag + tag + false + + + io.quarkus diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml index 63644ab052d88..1c12730c26749 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.acme @@ -12,10 +13,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} 2.0-SNAPSHOT @@ -25,13 +27,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml index 7af3419e8d125..1e0a949c2726b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -49,6 +50,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml index c962751b8d33f..57ae7bd9c0638 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml @@ -12,10 +12,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} library @@ -23,13 +24,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml index 291a82e229256..297dc0bbd0231 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml @@ -10,10 +10,11 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} @@ -46,6 +47,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml index f64668aec7e67..652088c953162 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml @@ -9,15 +9,15 @@ 1.0.0-SNAPSHOT - 3.1.2 + ${version.surefire.plugin} @project.version@ quarkus-bom io.quarkus @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 3.0.0 @@ -56,12 +56,20 @@ org.awaitility awaitility - \${awaitility.version} test + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml index 2b4130386375d..caaf8861c1e61 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml @@ -12,10 +12,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 rest-client-custom-headers @@ -23,13 +24,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/pom.xml index 22dd13714b837..b9806e2e5d073 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/pom.xml @@ -18,11 +18,11 @@ UTF-8 UTF-8 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} true @project.version@ - 3.8.1 + ${compiler-plugin.version} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml index 4503a562ed58c..c0beb57f6c2f5 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -63,6 +64,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/setup-on-existing-pom/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/setup-on-existing-pom/pom.xml index 0c4e8818e1ff3..e1be99103f1a5 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/setup-on-existing-pom/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/setup-on-existing-pom/pom.xml @@ -10,10 +10,10 @@ maven-compiler-plugin - 3.8.0 + ${compiler-plugin.version} - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/setup-with-custom-quarkus-version/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/setup-with-custom-quarkus-version/pom.xml index 4847e549e56c9..578f9038784c1 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/setup-with-custom-quarkus-version/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/setup-with-custom-quarkus-version/pom.xml @@ -9,10 +9,10 @@ maven-compiler-plugin - 3.8.0 + ${compiler-plugin.version} - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml index 4ea567ff87586..5a617c756a0ec 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.acme @@ -12,10 +13,11 @@ quarkus-bom @project.version@ @project.version@ - 3.1.2 + ${compiler-plugin.version} + ${version.surefire.plugin} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 - 11 app @@ -25,13 +27,24 @@ - - - io.quarkus - quarkus-maven-plugin - \${quarkus-plugin.version} - - + + + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + + + io.quarkus + quarkus-maven-plugin + \${quarkus-plugin.version} + + + diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml index 52a57346de7c8..952dc3932bb4a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml @@ -7,14 +7,14 @@ 1.0.0-SNAPSHOT pom - 3.8.1 - 11 + ${compiler-plugin.version} + ${maven.compiler.release} UTF-8 UTF-8 quarkus-bom io.quarkus @project.version@ - 3.1.2 + ${version.surefire.plugin} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml index 75414c4cbda0f..ad12a7c8c0b06 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml @@ -8,9 +8,9 @@ 3.3.0 - 3.8.1 - 3.2.0 - 11 + ${compiler-plugin.version} + ${maven-dependency-plugin.version} + ${maven.compiler.release} verify @@ -39,7 +39,7 @@ quarkus-bom io.quarkus @project.version@ - 3.1.2 + ${version.surefire.plugin} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml index d35cac3b2b2f3..f40e329c733b4 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 @@ -53,6 +54,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml index e16eece81e33c..68c39b0e932fd 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml @@ -10,9 +10,10 @@ quarkus-bom @project.version@ @project.version@ - 11 + ${compiler-plugin.version} + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 - 11 uber-jar @@ -48,6 +49,15 @@ + + maven-compiler-plugin + \${compiler-plugin.version} + + + -parameters + + + io.quarkus quarkus-maven-plugin diff --git a/test-framework/devmode-test-utils/pom.xml b/test-framework/devmode-test-utils/pom.xml index f608eedc3d9cc..4311def04cd6e 100644 --- a/test-framework/devmode-test-utils/pom.xml +++ b/test-framework/devmode-test-utils/pom.xml @@ -39,6 +39,10 @@ org.junit.jupiter junit-jupiter-engine + + io.smallrye.common + smallrye-common-os + diff --git a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java b/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java index a364f8fd0b3b0..82fe2688d8853 100644 --- a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java +++ b/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java @@ -20,8 +20,16 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import io.smallrye.common.os.OS; + public class DevModeClient { + private static final long DEFAULT_TIMEOUT = OS.current() == OS.WINDOWS ? 3L : 1L; + + static long getDefaultTimeout() { + return DEFAULT_TIMEOUT; + } + private final int port; public DevModeClient() { @@ -62,7 +70,7 @@ public static void filter(File input, Map variables) throws IOEx } public void awaitUntilServerDown() { - await().atMost(1, TimeUnit.MINUTES).until(() -> { + await().atMost(DEFAULT_TIMEOUT, TimeUnit.MINUTES).until(() -> { try { get(); // Ignore result on purpose return false; @@ -82,7 +90,7 @@ public String getHttpResponse(Supplier brokenReason) { .pollDelay(1, TimeUnit.SECONDS) //Allow for a long maximum time as the first hit to a build might require to download dependencies from Maven repositories; //some, such as org.jetbrains.kotlin:kotlin-compiler, are huge and will take more than a minute. - .atMost(3, TimeUnit.MINUTES).until(() -> { + .atMost(2L + DEFAULT_TIMEOUT, TimeUnit.MINUTES).until(() -> { try { String broken = brokenReason.get(); if (broken != null) { 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 204662b1d7406..535c95baf039d 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 @@ -112,6 +112,7 @@ public MavenProcessInvocationResult execute(List goals, Map