TEsting 31974 draft

bom/application/pom.xml

@@ -159,7 +159,7 @@
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.3.0</awaitility.version>
         <jboss-logmanager.version>3.1.2.Final</jboss-logmanager.version>
-        <flyway.version>11.8.2</flyway.version>
+        <flyway.version>11.9.0</flyway.version>
         <yasson.version>3.0.4</yasson.version>
         <!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
         <liquibase.version>4.29.1</liquibase.version>
@@ -180,7 +180,7 @@
         <quarkus-security.version>2.2.1</quarkus-security.version>
         <keycloak-client.version>26.0.5</keycloak-client.version>
         <logstash-gelf.version>1.15.1</logstash-gelf.version>
-        <checker-qual.version>3.49.3</checker-qual.version>
+        <checker-qual.version>3.49.4</checker-qual.version>
         <error-prone-annotations.version>2.38.0</error-prone-annotations.version>
         <jib-core.version>0.27.3</jib-core.version>
         <google-http-client.version>1.46.3</google-http-client.version>
@@ -194,7 +194,7 @@
         <log4j2-api.version>2.24.3</log4j2-api.version>
         <log4j-jboss-logmanager.version>1.3.1.Final</log4j-jboss-logmanager.version>
         <avro.version>1.12.0</avro.version>
-        <apicurio-registry.version>2.6.9.Final</apicurio-registry.version>
+        <apicurio-registry.version>2.6.11.Final</apicurio-registry.version>
         <apicurio-common-rest-client.version>0.1.18.Final</apicurio-common-rest-client.version> <!-- must be the version Apicurio Registry uses -->
         <testcontainers.version>1.21.1</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.4.2</docker-java.version> <!-- must be the version Testcontainers use: https://central.sonatype.com/artifact/org.testcontainers/testcontainers -->

build-parent/pom.xml

@@ -33,7 +33,7 @@
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.13</asciidoctorj.version>
-        <htmlunit.version>4.12.0</htmlunit.version>
+        <htmlunit.version>4.13.0</htmlunit.version>
         <javaparser-core.version>3.26.4</javaparser-core.version>
         <jdeparser.version>2.0.3.Final</jdeparser.version>
         <subethasmtp.version>6.0.1</subethasmtp.version>

docs/src/main/asciidoc/observability-devservices-lgtm.adoc

@@ -53,15 +53,15 @@ This is the most common way to output metrics from Micrometer and the default wa
 .pom.xml
 ----
 <dependency>
-    <groupId>io.quarkiverse.micrometer.registry</groupId>
+    <groupId>io.quarkus</groupId>
     <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
 </dependency>
 ----
 
 [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"]
 .build.gradle
 ----
-implementation("io.quarkiverse.micrometer.registry:quarkus-micrometer-registry-prometheus")
+implementation("io.quarkus:quarkus-micrometer-registry-prometheus")
 ----
 
 ==== Using the Micrometer OTLP registry

extensions/liquibase/liquibase-common/pom.xml

@@ -11,6 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-liquibase-common</artifactId>
+    <name>Quarkus - Liquibase - Common</name>
     <version>999-SNAPSHOT</version>
 
     <dependencies>

independent-projects/parent/pom.xml

@@ -20,7 +20,7 @@
         <version.archetype.plugin>3.4.0</version.archetype.plugin>
         <version.buildhelper.plugin>3.6.0</version.buildhelper.plugin>
         <version.buildnumber.plugin>3.2.1</version.buildnumber.plugin>
-        <version.clean.plugin>3.4.1</version.clean.plugin>
+        <version.clean.plugin>3.5.0</version.clean.plugin>
         <version.compiler.plugin>3.14.0</version.compiler.plugin>
         <version.dependency.plugin>3.8.1</version.dependency.plugin>
         <version.deploy.plugin>3.1.4</version.deploy.plugin>

integration-tests/gradle/src/main/resources/with-junit-properties-file/build.gradle

@@ -0,0 +1,39 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+    id 'application'
+}
+
+repositories {
+    mavenLocal {
+        content {
+            includeGroupByRegex 'io.quarkus.*'
+            includeGroup 'org.hibernate.orm'
+        }
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
+
+run {
+    // propagate the custom local maven repo, in case it's configured
+    if (System.properties.containsKey('maven.repo.local')) {
+        systemProperty 'maven.repo.local', System.properties.get('maven.repo.local')
+    }
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}

integration-tests/gradle/src/main/resources/with-junit-properties-file/gradle.properties

@@ -0,0 +1,5 @@
+quarkusPluginVersion=${project.version}
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPluginId=io.quarkus
+quarkusPlatformGroupId=io.quarkus
+quarkusPlatformVersion=${project.version}

integration-tests/gradle/src/main/resources/with-junit-properties-file/settings.gradle

@@ -0,0 +1,11 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        mavenLocal()
+    }
+    plugins {
+        id "${quarkusPluginId}" version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'

integration-tests/gradle/src/main/resources/with-junit-properties-file/src/main/java/org/acme/GreetingResource.java

@@ -0,0 +1,16 @@
+package org.acme;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello from Quarkus REST";
+    }
+}

integration-tests/gradle/src/main/resources/with-junit-properties-file/src/test/java/org/acme/GreetingResourceTest.java

@@ -0,0 +1,21 @@
+package org.acme;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class GreetingResourceTest {
+    @Test
+    void testHelloEndpoint() {
+        given()
+                .when().get("/hello")
+                .then()
+                .statusCode(200)
+                .body(is("Hello from Quarkus REST"));
+    }
+
+}

integration-tests/gradle/src/test/java/io/quarkus/gradle/TestWithAppJunitPropertiesFileTest.java

@@ -0,0 +1,21 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+public class TestWithAppJunitPropertiesFileTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void shouldRunTestsSuccessfully() throws Exception {
+
+        final File projectDir = getProjectDir("with-junit-properties-file");
+
+        BuildResult buildResult = runGradleWrapper(projectDir, "test");
+
+        assertThat(BuildResult.isSuccessful(buildResult.getTasks().get(":test"))).isTrue();
+
+    }
+}

integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusTestIT.java

@@ -229,4 +229,40 @@ public void testQuarkusTestWithConfigInTestProfile()
         assertThat(installInvocation.getExitCode()).isEqualTo(0);
 
     }
+
+    /*
+     * This should perhaps be in a different project, see https://github.com/quarkusio/quarkus/issues/46667
+     */ @Test
+    public void testQuarkusTestInProjectWithJUnitProperties()
+            throws MavenInvocationException, InterruptedException {
+        String sourceDir = "projects/test-tests-in-project-with-junit-properties-file";
+        testDir = initProject(sourceDir, sourceDir + "-processed");
+        RunningInvoker invoker = new RunningInvoker(testDir, false);
+
+        MavenProcessInvocationResult installInvocation = invoker.execute(
+                List.of("clean", "verify", "-Dquarkus.analytics.disabled=true"),
+                Collections.emptyMap());
+        assertThat(installInvocation.getProcess().waitFor(2, TimeUnit.MINUTES)).isTrue();
+        assertThat(installInvocation.getExecutionException()).isNull();
+        assertThat(installInvocation.getExitCode()).isEqualTo(0);
+
+    }
+
+    @Test
+    public void testQuarkusTestInProjectWithJUnitPropertiesContinuousTesting()
+            throws MavenInvocationException, FileNotFoundException {
+        // This test will fail if the test extension does not reset the TCCL properly
+        String sourceDir = "projects/test-tests-in-project-with-junit-properties-file";
+        testDir = initProject(sourceDir, sourceDir + "-processed-devmode");
+
+        runAndCheck();
+
+        ContinuousTestingMavenTestUtils testingTestUtils = new ContinuousTestingMavenTestUtils(getPort());
+        ContinuousTestingMavenTestUtils.TestStatus results = testingTestUtils.waitForNextCompletion();
+        // This is a bit brittle when we add tests, but failures are often so catastrophic they're not even reported as failures,
+        // so we need to check the pass count explicitly
+        Assertions.assertEquals(0, results.getTestsFailed());
+        Assertions.assertEquals(1, results.getTestsPassed());
+        Assertions.assertEquals(0, results.getTestsSkipped());
+    }
 }

integration-tests/maven/src/test/resources-filtered/projects/test-tests-in-project-with-junit-properties-file/pom.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.acme</groupId>
+    <artifactId>quarkus-test-test-profile</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <quarkus.platform.version>@project.version@</quarkus.platform.version>
+        <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+        <compiler-plugin.version>${compiler-plugin.version}</compiler-plugin.version>
+        <surefire-plugin.version>${version.surefire.plugin}</surefire-plugin.version>
+        <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+        <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>\${quarkus.platform.group-id}</groupId>
+                <artifactId>\${quarkus.platform.artifact-id}</artifactId>
+                <version>\${quarkus.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>\${surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <maven.home>\${maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>\${quarkus-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.native.enabled>true</quarkus.native.enabled>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>\${native.surefire.skip}</skipTests>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>\${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>\${project.build.directory}/\${project.build.finalName}-runner</native.image.path>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                                        <maven.home>\${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

integration-tests/maven/src/test/resources-filtered/projects/test-tests-in-project-with-junit-properties-file/src/main/java/org/acme/HelloResource.java

@@ -0,0 +1,22 @@
+package org.acme;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        // This config access only works if the TCCL is set properly
+        String message = ConfigProvider.getConfig().getValue("greeting.message", String.class);
+        return message;
+
+    }
+
+}

integration-tests/maven/src/test/resources-filtered/projects/test-tests-in-project-with-junit-properties-file/src/main/java/org/acme/Main.java

@@ -0,0 +1,18 @@
+package org.acme;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class Main implements QuarkusApplication {
+
+    public static volatile String[] PARAMS;
+
+    @Override
+    public int run(String... args) throws Exception {
+        PARAMS = args;
+        Quarkus.waitForExit();
+        return 0;
+    }
+}