Merge pull request #26406 from gsmet/2.10.1-backports-2

2.10.1 backports 2
quarkusio · Jun 28, 2022 · dd95216 · dd95216
2 parents 2394b6a + 71924e6
commit dd95216
Show file tree

Hide file tree

Showing 361 changed files with 2,032 additions and 701 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,6 @@
 # ./mvnw fails on Windows in git bash if -Xmx in that file has a trailing CRLF
 .mvn/jvm.config		text eol=lf
+*.xml	text eol=lf
+*.java	text diff=java eol=lf
+*.kt	text diff=kotlin eol=lf
 
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -28,7 +28,8 @@
         <opentelemetry-alpha.version>1.13.0-alpha</opentelemetry-alpha.version>
         <jaeger.version>1.8.0</jaeger.version>
         <quarkus-http.version>4.1.9</quarkus-http.version>
-        <micrometer.version>1.9.0</micrometer.version>
+        <micrometer.version>1.9.0</micrometer.version><!-- keep in sync with hdrhistogram -->
+        <hdrhistogram.version>2.1.12</hdrhistogram.version><!-- keep in sync with micrometer -->
         <google-auth.version>0.22.0</google-auth.version>
         <microprofile-config-api.version>2.0.1</microprofile-config-api.version>
         <microprofile-metrics-api.version>3.0.1</microprofile-metrics-api.version>
@@ -61,6 +62,7 @@
         <jakarta.interceptor-api.version>1.2.5</jakarta.interceptor-api.version>
         <jakarta.json.version>1.1.6</jakarta.json.version>
         <jakarta.json.bind-api.version>1.0.2</jakarta.json.bind-api.version>
+        <jakarta.mail.version>1.6.7</jakarta.mail.version>
         <jakarta.persistence-api.version>2.2.3</jakarta.persistence-api.version>
         <jakarta.security.jacc-api.version>1.6.1</jakarta.security.jacc-api.version>
         <jakarta.security.auth.message-api.version>1.1.3</jakarta.security.auth.message-api.version>
@@ -133,7 +135,7 @@
         <netty.version>4.1.74.Final</netty.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>
-        <mutiny.version>1.5.0</mutiny.version>
+        <mutiny.version>1.6.0</mutiny.version>
         <kafka3.version>3.1.0</kafka3.version>
         <lz4.version>1.8.0</lz4.version> <!-- dependency of the kafka-clients that could be overridden by other imported BOMs in the platform -->
         <snappy.version>1.1.8.4</snappy.version>
@@ -160,7 +162,8 @@
         <mongo-client.version>4.3.4</mongo-client.version>
         <mongo-crypt.version>1.2.1</mongo-crypt.version>
         <proton-j.version>0.33.10</proton-j.version>
-        <okhttp.version>3.14.9</okhttp.version>
+        <okhttp.version>3.14.9</okhttp.version><!-- keep in sync with okio -->
+        <okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
         <hibernate-quarkus-local-cache.version>0.1.1</hibernate-quarkus-local-cache.version>
         <flapdoodle.mongo.version>3.3.0</flapdoodle.mongo.version>
         <quarkus-spring-api.version>5.2.SP7</quarkus-spring-api.version>
@@ -171,7 +174,7 @@
         <jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <antlr.version>4.9.2</antlr.version>
         <quarkus-security.version>1.1.4.Final</quarkus-security.version>
-        <keycloak.version>18.0.0</keycloak.version>
+        <keycloak.version>18.0.1</keycloak.version>
         <logstash-gelf.version>1.15.0</logstash-gelf.version>
         <checker-qual.version>3.22.0</checker-qual.version>
         <error-prone-annotations.version>2.13.1</error-prone-annotations.version>
@@ -2885,7 +2888,12 @@
                 <version>${bytebuddy.version}</version>
             </dependency>
 
-            <!-- GRPC dependency -->
+            <!-- GRPC dependencies -->
+            <dependency>
+                <groupId>com.google.api.grpc</groupId>
+                <artifactId>proto-google-common-protos</artifactId>
+                <version>${proto-google-common-protos.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
                 <artifactId>jsr305</artifactId>
@@ -3130,6 +3138,17 @@
                         <groupId>org.apache.tomcat.embed</groupId>
                         <artifactId>tomcat-embed-core</artifactId>
                     </exclusion>
+                    <!-- jaeger-thrift 3.43.3 pulls in a banned version of annotation-api -->
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>javax.annotation-api</artifactId>
+                    </exclusion>
+                    <!-- it also pulls in the jakarta annotations via the 'org.apache.tomcat:tomcat-annotations-api' which seems to be a copy of 'jakarta.annotation:jakarta.annotation-api'-->
+                    <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-annotations-api -->
+                    <exclusion>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-annotations-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -3743,6 +3762,11 @@
                 <artifactId>jakarta.annotation-api</artifactId>
                 <version>${jakarta.annotation-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.sun.mail</groupId>
+                <artifactId>jakarta.mail</artifactId>
+                <version>${jakarta.mail.version}</version>
+            </dependency>
             <dependency>
                 <groupId>jakarta.persistence</groupId>
                 <artifactId>jakarta.persistence-api</artifactId>
@@ -3914,6 +3938,11 @@
                 <artifactId>logging-interceptor</artifactId>
                 <version>${okhttp.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${okio.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.mongodb</groupId>
                 <artifactId>mongodb-driver-sync</artifactId>
@@ -4820,6 +4849,12 @@
                 <groupId>com.cronutils</groupId>
                 <artifactId>cron-utils</artifactId>
                 <version>${cronutils.version}</version>
+                <exclusions>
+                    <exclusion><!-- Remove once https://github.com/jmrozanec/cron-utils/pull/521 reaches us -->
+                        <groupId>org.javassist</groupId>
+                        <artifactId>javassist</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.quartz-scheduler</groupId>
@@ -5528,6 +5563,13 @@
                 <version>${picocli.version}</version>
             </dependency>
 
+            <!-- Micrometer -->
+            <dependency>
+                <groupId>org.hdrhistogram</groupId>
+                <artifactId>HdrHistogram</artifactId>
+                <version>${hdrhistogram.version}</version>
+            </dependency>
+
             <!-- Quarkus build related dependencies -->
             <dependency>
                 <groupId>org.apache.commons</groupId>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -102,7 +102,7 @@
 
         <!-- The image to use for tests that run Keycloak -->
         <!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml and KeycloakBuildTimeConfig/DevServicesConfig in quarkus-oidc/deployment to match the version -->
-        <keycloak.version>18.0.0</keycloak.version>
+        <keycloak.version>18.0.1</keycloak.version>
         <keycloak.docker.image>quay.io/keycloak/keycloak:${keycloak.version}</keycloak.docker.image>
         <keycloak.docker.legacy.image>quay.io/keycloak/keycloak:${keycloak.version}-legacy</keycloak.docker.legacy.image>
 
@@ -583,6 +583,8 @@
                                             <!-- Includes its own copy of an old version of the servlet API-->
                                             <exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
                                             <exclude>org.jboss.modules:jboss-modules</exclude>
+                                            <!-- We prefer ByteBuddy where possible -->
+                                            <exclude>org.javassist:javassist</exclude>
                                         </excludes>
                                         <includes>
                                             <!-- this is for REST Assured -->
@@ -1156,13 +1158,13 @@
                             <newArtifacts>
                                 <artifact>${project.groupId}:${project.artifactId}:${revapi.newVersion}</artifact>
                             </newArtifacts>
-                            <!-- don't fail is false making it possible to have 
+                            <!-- don't fail is false making it possible to have
                                 revapi checks without requiring config files -->
                             <failOnMissingConfigurationFiles>false</failOnMissingConfigurationFiles>
-                            <!-- Consider changes from the latest .Final version, 
+                            <!-- Consider changes from the latest .Final version,
                                 not from the latest non-snapshot. -->
                             <versionFormat>\d+\.\d+\.\d+\.Final</versionFormat>
-                            <!-- By default revapi will check the oldArtifact 
+                            <!-- By default revapi will check the oldArtifact
                                 against the currently executed build -->
                             <!-- <checkDependencies>false</checkDependencies> -->
                             <analysisConfigurationFiles>
@@ -1176,8 +1178,8 @@
                                     </roots>
                                 </configurationFile>
                             </analysisConfigurationFiles>
-                            <!-- By default, revapi will only fail the build 
-                                 if there are potentially breaking or breaking changes. However, in the report 
+                            <!-- By default, revapi will only fail the build
+                                 if there are potentially breaking or breaking changes. However, in the report
                                  we want even non breaking changes to be present. -->
                             <reportSeverity>nonBreaking</reportSeverity>
                             <failSeverity>potentiallyBreaking</failSeverity>
@@ -1187,11 +1189,11 @@
                             <ignoreSuggestionsFile>${project.build.directory}/api-changes-suggestions.xml</ignoreSuggestionsFile>
                             <expandProperties>true</expandProperties>
                         </configuration>
-                        <!-- Running two executions is a workaround to make sure 
-                             we get a HTML report in case revapi finds some incompatible changes. The 
-                             "check" goal will simply fail the whole build before it could get to the 
-                             report. To make sure we always get a HTML report, the "report" goal needs 
-                             to be executed before the "check" goal. Once https://github.com/revapi/revapi/issues/11 
+                        <!-- Running two executions is a workaround to make sure
+                             we get a HTML report in case revapi finds some incompatible changes. The
+                             "check" goal will simply fail the whole build before it could get to the
+                             report. To make sure we always get a HTML report, the "report" goal needs
+                             to be executed before the "check" goal. Once https://github.com/revapi/revapi/issues/11
                              is fixed it should be possible to use single execution. -->
                         <executions>
                             <execution>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java b/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java
@@ -600,7 +600,7 @@ private static Consumer<BuildChainBuilder> loadStepsFromClass(Class<?> clazz,
                         methodParamFns.add((bc, bri) -> bc.consume(buildItemClass));
                     } else if (isAnEmptyBuildItemConsumer(parameterType)) {
                         throw reportError(parameter,
-                                "Cannot consume an empty build item, use @Produce(class) on the build step method instead");
+                                "Cannot consume an empty build item, use @Consume(class) on the build step method instead");
                     } else if (isAnEmptyBuildItemProducer(parameterType)) {
                         throw reportError(parameter,
                                 "Cannot produce an empty build item, use @Produce(class) on the build step method instead");

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
@@ -339,6 +339,12 @@ public void executionFinished(TestIdentifier testIdentifier,
                                                         TestExecutionResult.failed(failure), List.of(), false, runId, 0,
                                                         false));
                                         results.put(UniqueId.parse(currentNonDynamicTest.get().getUniqueId()), result);
+                                    } else if (testExecutionResult.getStatus() == TestExecutionResult.Status.FAILED) {
+                                        Throwable throwable = testExecutionResult.getThrowable().get();
+                                        trimStackTrace(testClass, throwable);
+                                        for (var i : throwable.getSuppressed()) {
+                                            trimStackTrace(testClass, i);
+                                        }
                                     }
                                 } else if (testExecutionResult.getStatus() == TestExecutionResult.Status.FAILED) {
                                     //if a parent fails we fail the children

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java
@@ -217,6 +217,7 @@ public void runComplete(TestRunResults results) {
                 } else {
                     currentlyFailing = true;
                     //TODO: this should not use the logger, it should print a nicer status
+                    //first print the full failures
                     log.error(statusHeader("TEST REPORT #" + results.getId()));
                     for (Map.Entry<String, TestClassResult> classEntry : results.getCurrentFailing().entrySet()) {
                         for (TestResult test : classEntry.getValue().getFailing()) {
@@ -227,6 +228,36 @@ public void runComplete(TestRunResults results) {
                             }
                         }
                     }
+                    //then print the summary
+                    StringBuilder summary = new StringBuilder(statusFooter(RED + "Summary:") + "\n");
+                    for (Map.Entry<String, TestClassResult> classEntry : results.getCurrentFailing().entrySet()) {
+                        for (TestResult test : classEntry.getValue().getFailing()) {
+                            if (test.isReportable()) {
+                                StackTraceElement testclass = null;
+                                for (var i : test.getTestExecutionResult().getThrowable().get().getStackTrace()) {
+                                    if (i.getClassName().equals(test.testClass)) {
+                                        testclass = i;
+                                        break;
+                                    }
+                                }
+
+                                if (summary.charAt(summary.length() - 1) != '\n') {
+                                    summary.append("\n");
+                                }
+                                if (testclass != null) {
+                                    summary.append(testclass.getClassName() + "#" + testclass.getMethodName() + "("
+                                            + testclass.getFileName() + ":" + testclass.getLineNumber() + ") ");
+                                }
+                                summary.append(RED
+                                        + test.getDisplayName() + RESET
+                                        + " " + test.getTestExecutionResult().getThrowable().get().getMessage());
+                            }
+                        }
+                    }
+                    while (summary.charAt(summary.length() - 1) == '\n') {
+                        summary.setLength(summary.length() - 1);
+                    }
+                    log.error(summary.toString());
                     log.error(
                             statusFooter(RED + results.getCurrentFailedCount() + " "
                                     + pluralize("TEST", "TESTS", results.getCurrentFailedCount()) + " FAILED"));

diff --git a/devtools/gradle/build.gradle b/devtools/gradle/build.gradle
@@ -21,14 +21,7 @@ subprojects {
     }
 
     repositories {
-        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
-        if (System.properties.containsKey('maven.repo.local')) {
-            maven {
-                url System.properties.get('maven.repo.local')
-            }
-        } else {
-            mavenLocal()
-        }
+        mavenLocal()
         mavenCentral()
     }