[3.15] Backports for PRs before 7.9.2024

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
           check-latest: true
       - name: Build Quarkus 3.14
         run: |
-          git clone -b 3.14 https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
+          git clone -b 3.14 https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B --no-transfer-progress -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
       - name: Tar Maven Repo
         shell: bash
         run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
@@ -57,7 +57,7 @@ jobs:
         run: tar -xzf maven-repo.tgz -C ~
       - name: Build with Maven
         run: |
-          mvn -V -B -s .github/mvn-settings.xml verify -Dall-modules -Dvalidate-format -DskipTests -DskipITs -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
+          mvn -V -B --no-transfer-progress -s .github/mvn-settings.xml verify -Dall-modules -Dvalidate-format -DskipTests -DskipITs -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
   detect-test-suite-modules:
     name: Detect Modules in PR
     runs-on: ubuntu-latest
@@ -156,7 +156,7 @@ jobs:
           ./quarkus-dev-cli version
       - name: Build with Maven
         run: |
-          mvn -fae -V -B -s .github/mvn-settings.xml clean verify -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"${{ matrix.module-mvn-args }} -am -DexcludedGroups=long-running
+          mvn -fae -V -B --no-transfer-progress -s .github/mvn-settings.xml clean verify -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"${{ matrix.module-mvn-args }} -am -DexcludedGroups=long-running
       - name: Detect flaky tests
         id: flaky-test-detector
         if: ${{ hashFiles('**/flaky-run-report.json') != '' }}
@@ -210,7 +210,7 @@ jobs:
           ./quarkus-dev-cli version
       - name: Build with Maven
         run: |
-            mvn -fae -V -B -s .github/mvn-settings.xml -fae \
+            mvn -fae -V -B --no-transfer-progress -s .github/mvn-settings.xml -fae \
                         -Dquarkus.native.native-image-xmx=5g \
                         -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli" \
                         ${{ matrix.module-mvn-args }} clean verify -Dnative -am -DexcludedGroups=long-running
@@ -264,7 +264,7 @@ jobs:
             MODULES_MAVEN_PARAM="-pl ${MODULES_ARG}"
           fi
 
-          mvn -B -fae -s .github/mvn-settings.xml clean verify -Dall-modules $MODULES_MAVEN_PARAM -am -DexcludedGroups=long-running
+          mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean verify -Dall-modules $MODULES_MAVEN_PARAM -am -DexcludedGroups=long-running
       - name: Detect flaky tests
         id: flaky-test-detector
         if: ${{ hashFiles('**/flaky-run-report.json') != '' }}

.github/workflows/daily.yaml

@@ -24,7 +24,7 @@ jobs:
           check-latest: true
       - name: Build Quarkus main
         run: |
-          git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
+          git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B --no-transfer-progress -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
       - name: Tar Maven Repo
         shell: bash
         run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
@@ -73,7 +73,7 @@ jobs:
           ./quarkus-dev-cli version
       - name: Test in JVM mode
         run: |
-          mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -P ${{ matrix.profiles }} -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
+          mvn -fae -V -B --no-transfer-progress -s .github/mvn-settings.xml -fae clean verify -P ${{ matrix.profiles }} -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
       - name: Zip Artifacts
         if: failure()
         run: |
@@ -127,7 +127,7 @@ jobs:
           ./quarkus-dev-cli version
       - name: Test in Native mode
         run: |
-          mvn -fae -V -B -s .github/mvn-settings.xml -P ${{ matrix.profiles }} -fae clean verify -Dnative \
+          mvn -fae -V -B --no-transfer-progress -s .github/mvn-settings.xml -P ${{ matrix.profiles }} -fae clean verify -Dnative \
             -Dquarkus.native.builder-image=quay.io/quarkus/${{ matrix.image }} \
             -Dquarkus.native.native-image-xmx=5g \
             -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
@@ -168,7 +168,7 @@ jobs:
       - name: Build in JVM mode
         shell: bash
         run: |
-          mvn -B -fae -s .github/mvn-settings.xml clean verify
+          mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean verify
       - name: Zip Artifacts
         shell: bash
         if: failure()
@@ -222,7 +222,7 @@ jobs:
         shell: bash
         run: |
           # Running only http/http-minimum as after some time, it gives disk full in Windows when running on Native.
-          mvn -B -fae -s .github/mvn-settings.xml clean verify -Dall-modules -Dnative -Dquarkus.native.container-build=false -pl http/http-minimum
+          mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean verify -Dall-modules -Dnative -Dquarkus.native.container-build=false -pl http/http-minimum
       - name: Zip Artifacts
         shell: bash
         if: failure()

build/podman/pom.xml

@@ -55,5 +55,37 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>openshift</id>
+            <activation>
+                <property>
+                    <name>openshift</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>${quarkus.platform.group-id}</groupId>
+                        <artifactId>quarkus-maven-plugin</artifactId>
+                        <version>${quarkus.platform.version}</version>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

http/grpc/src/main/java/io/quarkus/ts/http/grpc/GrpcReflectionResponse.java

@@ -3,8 +3,11 @@
 import java.util.List;
 
 public final class GrpcReflectionResponse {
-    private final int serviceCount;
-    private final List<String> serviceList;
+    private int serviceCount;
+    private List<String> serviceList;
+
+    public GrpcReflectionResponse() {
+    }
 
     public GrpcReflectionResponse(int serviceCount, List<String> serviceList) {
         this.serviceCount = serviceCount;
@@ -19,4 +22,11 @@ public int getServiceCount() {
         return serviceCount;
     }
 
+    public void setServiceCount(int serviceCount) {
+        this.serviceCount = serviceCount;
+    }
+
+    public void setServiceList(List<String> serviceList) {
+        this.serviceList = serviceList;
+    }
 }

http/grpc/src/main/resources/application.properties

@@ -9,13 +9,31 @@ quarkus.grpc.server.enable-reflection-service=true
 quarkus.grpc.clients.reflection-service.port=${quarkus.grpc.clients.plain.port}
 quarkus.grpc.clients.streaming.port=${quarkus.grpc.clients.plain.port}
 
-%ssl.quarkus.grpc.clients.plain.ssl.trust-store=tls/ca.pem
-%ssl.quarkus.grpc.clients.reflection-service.ssl.trust-store=${quarkus.grpc.clients.plain.ssl.trust-store}
-%ssl.quarkus.grpc.clients.streaming.ssl.trust-store=${quarkus.grpc.clients.plain.ssl.trust-store}
+%ssl.quarkus.grpc.clients.plain.ssl.trust-store=${grpc.client.ca-cert}
+%ssl.quarkus.grpc.clients.reflection-service.ssl.trust-store=${grpc.client.ca-cert}
+%ssl.quarkus.grpc.clients.streaming.ssl.trust-store=${grpc.client.ca-cert}
 
 # See https://github.com/quarkusio/quarkus/issues/38965 to learn, why we use these parameters
 %ssl.quarkus.grpc.clients.plain.port=${quarkus.http.ssl-port}
-%ssl.quarkus.http.ssl.certificate.files=tls/server.pem
-%ssl.quarkus.http.ssl.certificate.key-files=tls/server.key
-%ssl.quarkus.grpc.server.ssl.certificate=tls/server.pem
-%ssl.quarkus.grpc.server.ssl.key=tls/server.key
+%ssl.quarkus.http.ssl.certificate.files=${grpc.server.cert}
+%ssl.quarkus.http.ssl.certificate.key-files=${grpc.server.key}
+%ssl.quarkus.grpc.server.ssl.certificate=${grpc.server.cert}
+%ssl.quarkus.grpc.server.ssl.key=${grpc.server.key}
+
+%mtls.quarkus.http.insecure-requests=disabled
+%mtls.quarkus.grpc.server.plain-text=false
+%mtls.quarkus.grpc.clients.plain.tls-configuration-name=mtls-client
+%mtls.quarkus.grpc.clients.reflection-service.tls-configuration-name=mtls-client
+%mtls.quarkus.grpc.clients.streaming.tls-configuration-name=mtls-client
+%mtls.quarkus.grpc.clients.plain.tls.enabled=true
+%mtls.quarkus.grpc.clients.reflection-service.tls.enabled=true
+%mtls.quarkus.grpc.clients.streaming.tls.enabled=true
+%mtls.quarkus.grpc.clients.plain.plain-text=false
+%mtls.quarkus.grpc.clients.reflection-service.plain-text=false
+%mtls.quarkus.grpc.clients.streaming.plain-text=false
+%mtls.quarkus.grpc.clients.reflection-service.use-quarkus-grpc-client=true
+%mtls.quarkus.grpc.clients.streaming.use-quarkus-grpc-client=true
+%mtls.quarkus.grpc.clients.plain.port=${quarkus.http.ssl-port}
+%mtls.quarkus.tls.mtls-client.key-store.pem.0.cert=${grpc.client.crt}
+%mtls.quarkus.tls.mtls-client.key-store.pem.0.key=${grpc.client.key}
+%mtls.quarkus.tls.mtls-client.trust-store.pem.certs=${grpc.client.ca-crt}

http/grpc/src/test/java/io/quarkus/ts/http/grpc/GRPCIT.java

@@ -1,51 +1,55 @@
 package io.quarkus.ts.http.grpc;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Iterator;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.http.HttpStatus;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.grpc.Channel;
-import io.quarkus.test.bootstrap.RestService;
+import io.quarkus.test.bootstrap.CloseableManagedChannel;
 import io.quarkus.ts.grpc.GreeterGrpc;
 import io.quarkus.ts.grpc.HelloReply;
 import io.quarkus.ts.grpc.HelloRequest;
 import io.quarkus.ts.grpc.StreamingGrpc;
+import io.vertx.mutiny.ext.web.client.WebClient;
 
 public interface GRPCIT {
 
-    RestService app();
+    CloseableManagedChannel getChannel();
 
-    Channel getChannel();
+    WebClient getWebClient();
 
     @Test
     default void grpcClient() {
-        app().given().get("/http/grpc").then()
-                .statusCode(HttpStatus.SC_OK)
-                .body(is("Hello grpc"));
+        var response = getWebClient().get("/http/grpc").sendAndAwait();
+        assertEquals(HttpStatus.SC_OK, response.statusCode());
+        assertTrue(response.bodyAsString().startsWith("Hello grpc"));
     }
 
     @Test
     default void grpcServer() throws ExecutionException, InterruptedException {
-        HelloRequest request = HelloRequest.newBuilder().setName("server").build();
-        HelloReply response = GreeterGrpc.newFutureStub(getChannel()).sayHello(request).get();
-        Assertions.assertEquals("Hello server", response.getMessage());
+        try (var channel = getChannel()) {
+            HelloRequest request = HelloRequest.newBuilder().setName("server").build();
+            HelloReply response = GreeterGrpc.newFutureStub(channel).sayHello(request).get();
+            assertEquals("Hello server", response.getMessage());
+        }
     }
 
     @Test
     default void serverStream() {
-        HelloRequest request = HelloRequest.newBuilder().setName("ServerStream").build();
-        Iterator<HelloReply> stream = StreamingGrpc.newBlockingStub(getChannel()).serverStream(request);
-        AtomicInteger counter = new AtomicInteger(0);
-        stream.forEachRemaining((reply) -> {
-            Assertions.assertEquals("Hello ServerStream", reply.getMessage());
-            counter.incrementAndGet();
-        });
-        Assertions.assertEquals(GrpcStreamingService.SERVER_STREAM_MESSAGES_COUNT, counter.get());
+        try (var channel = getChannel()) {
+            HelloRequest request = HelloRequest.newBuilder().setName("ServerStream").build();
+            Iterator<HelloReply> stream = StreamingGrpc.newBlockingStub(channel).serverStream(request);
+            AtomicInteger counter = new AtomicInteger(0);
+            stream.forEachRemaining((reply) -> {
+                assertEquals("Hello ServerStream", reply.getMessage());
+                counter.incrementAndGet();
+            });
+            assertEquals(GrpcStreamingService.SERVER_STREAM_MESSAGES_COUNT, counter.get());
+        }
     }
 }