Merge pull request #30749 from gsmet/2.16.1-backports-2

2.16.1 backports 2

.github/dependabot.yml

@@ -74,6 +74,7 @@ updates:
       # RX Java 2
       - dependency-name: io.reactivex.rxjava2:rxjava
       # Test dependencies
+      - dependency-name: net.sourceforge.htmlunit:htmlunit
       - dependency-name: io.rest-assured:*
       - dependency-name: org.junit:junit-bom
       - dependency-name: org.junit.jupiter:*

bom/application/pom.xml

@@ -86,7 +86,7 @@
         <graal-sdk.version>22.3.0</graal-sdk.version>
         <graal-svm.version>${graal-sdk.version}</graal-svm.version>
         <gizmo.version>1.6.0.Final</gizmo.version>
-        <jackson-bom.version>2.14.1</jackson-bom.version>
+        <jackson-bom.version>2.14.2</jackson-bom.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-codec.version>1.15</commons-codec.version>
@@ -122,7 +122,7 @@
         <quartz.version>2.3.2</quartz.version>
         <h2.version>2.1.214</h2.version>
         <postgresql-jdbc.version>42.5.1</postgresql-jdbc.version>
-        <mariadb-jdbc.version>3.1.1</mariadb-jdbc.version>
+        <mariadb-jdbc.version>3.1.2</mariadb-jdbc.version>
         <mysql-jdbc.version>8.0.30</mysql-jdbc.version>
         <mssql-jdbc.version>11.2.3.jre11</mssql-jdbc.version>
         <adal4j.version>1.6.7</adal4j.version>
@@ -131,7 +131,7 @@
         <db2-jdbc.version>11.5.8.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <rest-assured.version>4.5.1</rest-assured.version>
-        <junit.jupiter.version>5.9.1</junit.jupiter.version>
+        <junit.jupiter.version>5.9.2</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
         <testng.version>6.14.2</testng.version>
         <infinispan.version>14.0.6.Final</infinispan.version>
@@ -141,7 +141,7 @@
         <brotli4j.version>1.8.0</brotli4j.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>
-        <mutiny.version>1.8.0</mutiny.version>
+        <mutiny.version>1.9.0</mutiny.version>
         <kafka3.version>3.3.2</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>
@@ -188,7 +188,7 @@
         <jib-core.version>0.23.0</jib-core.version>
         <google-http-client.version>1.42.3</google-http-client.version>
         <scram-client.version>2.1</scram-client.version>
-        <picocli.version>4.7.0</picocli.version>
+        <picocli.version>4.7.1</picocli.version>
         <google-cloud-functions.version>1.0.4</google-cloud-functions.version>
         <commons-compress.version>1.22</commons-compress.version>
         <commons-text.version>1.10.0</commons-text.version>

build-parent/pom.xml

@@ -38,7 +38,7 @@
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.7</asciidoctorj.version>
-        <htmlunit.version>2.40.0</htmlunit.version>
+        <htmlunit.version>2.70.0</htmlunit.version>
         <javaparser-core.version>3.24.2</javaparser-core.version>
         <jdeparser.version>2.0.3.Final</jdeparser.version>
         <subethasmtp.version>5.2.8</subethasmtp.version>

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Objects;
@@ -19,6 +18,7 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSet;
@@ -39,7 +39,7 @@ public class QuarkusPluginExtension {
 
     private final Property<String> finalName;
 
-    private Map<String, String> quarkusBuildProperties;
+    private final MapProperty<String, String> quarkusBuildProperties;
     private final SourceSetExtension sourceSetExtension;
 
     public QuarkusPluginExtension(Project project) {
@@ -49,7 +49,7 @@ public QuarkusPluginExtension(Project project) {
         finalName.convention(project.provider(() -> String.format("%s-%s", project.getName(), project.getVersion())));
 
         this.sourceSetExtension = new SourceSetExtension();
-        quarkusBuildProperties = new HashMap<>();
+        this.quarkusBuildProperties = project.getObjects().mapProperty(String.class, String.class);
     }
 
     public void beforeTest(Test task) {
@@ -99,7 +99,7 @@ public void beforeTest(Test task) {
     public String buildNativeRunnerName(final Map<String, Object> taskSystemProps) {
         Properties properties = new Properties(taskSystemProps.size());
         properties.putAll(taskSystemProps);
-        quarkusBuildProperties.entrySet()
+        quarkusBuildProperties.get().entrySet()
                 .forEach(buildEntry -> properties.putIfAbsent(buildEntry.getKey(), buildEntry.getValue()));
         System.getProperties().entrySet()
                 .forEach(propEntry -> properties.putIfAbsent(propEntry.getKey(), propEntry.getValue()));
@@ -215,12 +215,16 @@ public Path appJarOrClasses() {
         return classesDir;
     }
 
-    public Map<String, String> getQuarkusBuildProperties() {
+    public MapProperty<String, String> getQuarkusBuildProperties() {
         return quarkusBuildProperties;
     }
 
     public void set(String name, @Nullable String value) {
         quarkusBuildProperties.put(String.format("quarkus.%s", name), value);
     }
 
+    public void set(String name, Property<String> value) {
+        quarkusBuildProperties.put(String.format("quarkus.%s", name), value);
+    }
+
 }

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java

@@ -256,8 +256,9 @@ private String getPropValueWithPrecedence(final String propName, final java.util
                 }
             });
         }
-        if (extension().getQuarkusBuildProperties().containsKey(propName)) {
-            return extension().getQuarkusBuildProperties().get(propName);
+        Map<String, String> quarkusBuildProperties = extension().getQuarkusBuildProperties().get();
+        if (quarkusBuildProperties.containsKey(propName)) {
+            return quarkusBuildProperties.get(propName);
         } else if (applicationProperties.contains(propName)) {
             return applicationProperties.getProperty(propName);
         } else if (getQuarkusBuildEnvProperties().containsKey(propName)) {

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java

@@ -13,8 +13,6 @@ public abstract class QuarkusTask extends DefaultTask {
     private QuarkusPluginExtension extension;
 
     QuarkusTask(String description) {
-        GradleLogger.logSupplier = this::getLogger;
-
         setDescription(description);
         setGroup("quarkus");
     }
@@ -36,8 +34,9 @@ protected Properties getBuildSystemProperties(ResolvedDependency appArtifact) {
                 realProperties.setProperty(key, (String) value);
             }
         }
-        if (!extension().getQuarkusBuildProperties().isEmpty()) {
-            extension().getQuarkusBuildProperties().entrySet().stream().filter(entry -> entry.getKey().startsWith("quarkus."))
+        Map<String, String> quarkusBuildProperties = extension().getQuarkusBuildProperties().get();
+        if (!quarkusBuildProperties.isEmpty()) {
+            quarkusBuildProperties.entrySet().stream().filter(entry -> entry.getKey().startsWith("quarkus."))
                     .forEach(entry -> {
                         realProperties.put(entry.getKey(), entry.getValue());
                     });

docs/src/main/asciidoc/micrometer.adoc

@@ -367,11 +367,11 @@ timers, look for `http_server_requests_seconds_count`, `http_server_requests_sec
 ----
 # HELP http_server_requests_seconds
 # TYPE http_server_requests_seconds summary
-http_server_requests_seconds_count{method="GET",outcome="SUCCESS",status="200",uri="/example/prime/{number}",} 1.0
-http_server_requests_seconds_sum{method="GET",outcome="SUCCESS",status="200",uri="/example/prime/{number}",} 0.017385896
+http_server_requests_seconds_count{method="GET",outcome="SUCCESS",status="200",uri="/example/prime/{number}"} 1.0
+http_server_requests_seconds_sum{method="GET",outcome="SUCCESS",status="200",uri="/example/prime/{number}"} 0.017385896
 # HELP http_server_requests_seconds_max
 # TYPE http_server_requests_seconds_max gauge
-http_server_requests_seconds_max{method="GET",outcome="SUCCESS",status="200",uri="/example/prime/{number}",} 0.017385896
+http_server_requests_seconds_max{method="GET",outcome="SUCCESS",status="200",uri="/example/prime/{number}"} 0.017385896
 #
 ----
 
@@ -398,6 +398,11 @@ string. For example, setting
 `quarkus.micrometer.binder.http-server.match-patterns=/example/prime/[0-9]+=/example/{jellybeans}` would use the value
 `/example/{jellybeans}` for the uri attribute any time the requested uri matches `/example/prime/[0-9]+`.
 
+.Exported metrics format
+
+By default, the  metrics are exported using the Prometheus format `application/openmetrics-text`,
+you can revert to the former format by specifying the `Accept` request header to `plain/text` (`curl -H "Accept: plain/text" localhost:8080/q/metrics/`).
+
 == Using MeterFilter to configure metrics
 
 Micrometer uses `MeterFilter` instances to customize the metrics emitted by `MeterRegistry` instances.