Merge branch 'main' into jib-ubi-version-update

.github/workflows/doc-build.yml

@@ -55,7 +55,15 @@ jobs:
 
       - name: Build Docs
         run: |
-          ./mvnw -e -B --settings .github/mvn-settings.xml clean package -pl docs -Dasciidoctor.fail-if=INFO
+          if ./mvnw -e -B --settings .github/mvn-settings.xml clean package -pl docs -Dasciidoctor.fail-if=DEBUG ; then
+            echo "Build ok"
+          else
+            if [ -f docs/target/metadataErrors.md ]; then
+              echo "### Document Metadata Errors" >> $GITHUB_STEP_SUMMARY
+              cat docs/target/metadataErrors.md >> $GITHUB_STEP_SUMMARY
+            fi
+            exit 1
+          fi
 
       - name: Store PR id
         run: echo ${{ github.event.number }} > pr-id.txt

bom/application/pom.xml

@@ -153,11 +153,11 @@
         <!-- Scala is used by Kafka so we need to choose a compatible version -->
         <scala.version>2.13.10</scala.version>
         <aws-lambda-java.version>1.2.2</aws-lambda-java.version>
-        <aws-lambda-java-events.version>3.11.1</aws-lambda-java-events.version>
+        <aws-lambda-java-events.version>3.11.2</aws-lambda-java-events.version>
         <aws-xray.version>2.14.0</aws-xray.version>
         <azure-functions-java-library.version>2.2.0</azure-functions-java-library.version>
         <azure-functions-java-spi.version>1.0.0</azure-functions-java-spi.version>
-        <kotlin.version>1.8.21</kotlin.version>
+        <kotlin.version>1.8.22</kotlin.version>
         <kotlin.coroutine.version>1.7.1</kotlin.coroutine.version>
         <azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
         <kotlin.coroutine.version>1.6.4</kotlin.coroutine.version>
@@ -168,9 +168,7 @@
         <jboss-logmanager.version>1.1.1</jboss-logmanager.version>
         <flyway.version>9.17.0</flyway.version>
         <yasson.version>3.0.3</yasson.version>
-        <!-- these two artifacts needs to be compatible together -->
-        <liquibase.version>4.21.1</liquibase.version>
-        <liquibase-mongodb.version>4.21.0</liquibase-mongodb.version>
+        <liquibase.version>4.20.0</liquibase.version>
         <snakeyaml.version>2.0</snakeyaml.version>
         <osgi.version>6.0.0</osgi.version>
         <mongo-client.version>4.9.1</mongo-client.version>
@@ -206,7 +204,7 @@
         <log4j-jboss-logmanager.version>1.3.0.Final</log4j-jboss-logmanager.version>
         <avro.version>1.11.1</avro.version>
         <apicurio-registry.version>2.4.3.Final</apicurio-registry.version>
-        <apicurio-common-rest-client.version>0.1.15.Final</apicurio-common-rest-client.version> <!-- must be the version Apicurio Registry uses -->
+        <apicurio-common-rest-client.version>0.1.17.Final</apicurio-common-rest-client.version> <!-- must be the version Apicurio Registry uses -->
         <testcontainers.version>1.18.3</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.3.0</docker-java.version> <!-- must be the version Testcontainers use -->
         <com.dajudge.kindcontainer>1.3.0</com.dajudge.kindcontainer>
@@ -1886,6 +1884,13 @@
                 <artifactId>quarkus-reactive-datasource-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-reactive-datasource-deployment</artifactId>
+                <version>${project.version}</version>
+                <scope>test</scope>
+                <type>test-jar</type>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-reactive-db2-client</artifactId>
@@ -6167,7 +6172,7 @@
             <dependency>
                 <groupId>org.liquibase.ext</groupId>
                 <artifactId>liquibase-mongodb</artifactId>
-                <version>${liquibase-mongodb.version}</version>
+                <version>${liquibase.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.codehaus.groovy</groupId>

build-parent/pom.xml

@@ -21,7 +21,7 @@
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
         <!-- Quarkus uses jboss-parent and it comes with 3.8.1-jboss-1, we don't want that in the templates -->
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
-        <kotlin.version>1.8.21</kotlin.version>
+        <kotlin.version>1.8.22</kotlin.version>
         <dokka.version>1.8.10</dokka.version>
         <scala.version>2.13.8</scala.version>
         <scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>

core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java

@@ -285,8 +285,11 @@ default String getEffectiveImage() {
 
     /**
      * If full stack traces are enabled in the resulting image
+     *
+     * @deprecated GraalVM 23.1+ will always build with full stack traces.
      */
     @WithDefault("true")
+    @Deprecated
     boolean fullStackTraces();
 
     /**

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java

@@ -136,6 +136,7 @@ public static final class Version implements Comparable<Version> {
         public static final Version VERSION_22_3_0 = new Version("GraalVM 22.3.0", "22.3.0", Distribution.ORACLE);
         public static final Version VERSION_22_2_0 = new Version("GraalVM 22.2.0", "22.2.0", Distribution.ORACLE);
         public static final Version VERSION_23_0_0 = new Version("GraalVM 23.0.0", "23.0.0", Distribution.ORACLE);
+        public static final Version VERSION_23_1_0 = new Version("GraalVM 23.1.0", "23.1.0", Distribution.ORACLE);
 
         public static final Version MINIMUM = VERSION_22_2_0;
         public static final Version CURRENT = VERSION_22_3_2;

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java

@@ -900,10 +900,13 @@ public NativeImageInvokerInfo build() {
                 } else {
                     nativeImageArgs.add("-H:-UseServiceLoaderFeature");
                 }
-                if (nativeConfig.fullStackTraces()) {
-                    nativeImageArgs.add("-H:+StackTrace");
-                } else {
-                    nativeImageArgs.add("-H:-StackTrace");
+                // This option has no effect on GraalVM 23.1+
+                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) < 0) {
+                    if (nativeConfig.fullStackTraces()) {
+                        nativeImageArgs.add("-H:+StackTrace");
+                    } else {
+                        nativeImageArgs.add("-H:-StackTrace");
+                    }
                 }
 
                 if (nativeConfig.enableDashboardDump()) {

devtools/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java

@@ -106,7 +106,7 @@ public void shouldReturnMultipleOutputSourceDirectories() {
 
     @Test
     public void shouldNotFailOnProjectDependenciesWithoutMain(@TempDir Path testProjectDir) throws IOException {
-        var kotlinVersion = System.getProperty("kotlin_version", "1.8.20");
+        var kotlinVersion = System.getProperty("kotlin_version", "1.8.22");
         var settingFile = testProjectDir.resolve("settings.gradle.kts");
         var mppProjectDir = testProjectDir.resolve("mpp");
         var quarkusProjectDir = testProjectDir.resolve("quarkus");

devtools/gradle/gradle/libs.versions.toml

@@ -1,8 +1,9 @@
 [versions]
 plugin-publish = "1.2.0"
 
+# updating Kotlin here makes QuarkusPluginTest > shouldNotFailOnProjectDependenciesWithoutMain(Path) fail
 kotlin = "1.8.10"
-smallrye-config = "3.2.1"
+smallrye-config = "3.3.0"
 
 junit5 = "5.9.3"
 assertj = "3.24.2"

docs/pom.xml

@@ -3003,7 +3003,7 @@
                     </execution>
                     <execution>
                         <id>generate-doc-manifests</id>
-                        <phase>prepare-package</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>java</goal>
                         </goals>

docs/src/main/asciidoc/_examples/acme-serve-http-requests-tutorial.adoctxt

@@ -6,12 +6,13 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 [id="acme-serve-http-requests-tutorial"]
 = Serve Http requests using the Acme extension
 include::_attributes.adoc[]
+:diataxis-type: tutorial
 :categories: web
 :extension-status: experimental
 
-In this tutorial, we will create an application that uses unique annotations from the experimental acme extension to define two endpoints:
-a simple Http endpoint and an endpoint that emits Server-Sent Events (SSE).
-We will also use Quarkus dev mode for iterative development and test.
+Create an application that uses unique annotations from the experimental acme extension to define two endpoints:
+a simple HTTP endpoint and an endpoint that emits server-sent events (SSE).
+We will also use Quarkus dev mode for iterative development and testing.
 
 include::{includes}/extension-status.adoc[]
 

docs/src/main/asciidoc/_templates/template-concept.adoc

@@ -4,14 +4,15 @@ and pull requests should be submitted there:
 https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 ////
-TODO: xref:{doc-guides}/doc-reference.adoc[Quarkus style and content guidelines] for details
-- Title should have an implied "Understanding..." in front. 
-- ID should end with '-concept' (using the filename works)
-- choose appropriate categories
+TODO: 
+- Title: https://quarkus.io/guides/doc-reference#titles-headings
+- Use the file name as the ID
+- Choose appropriate categories: https://quarkus.io/guides/doc-reference#categories
 ////
-[id="...-concept"]
+[id="..."]
 = Title using sentence capitalization
 include::_attributes.adoc[]
+:diataxis-type: concept
 :categories: ...
 ////
 :extension-status: preview

docs/src/main/asciidoc/_templates/template-howto.adoc

@@ -4,14 +4,15 @@ and pull requests should be submitted there:
 https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 ////
-TODO: See xref:{doc-guides}/doc-reference.adoc[Quarkus style and content guidelines] for details
-- Title should have an implied "How to..." in front.
-- ID should end with '-howto' (using the filename works)
-- choose appropriate categories
+TODO:
+- Title: https://quarkus.io/guides/doc-reference#titles-headings
+- Use the file name as the ID
+- Choose appropriate categories: https://quarkus.io/guides/doc-reference#categories
 ////
-[id="...-howto"]
+[id="..."]
 = Title using sentence capitalization
 include::_attributes.adoc[]
+:diataxis-type: howto
 :categories: ...
 ////
 :extension-status: preview

docs/src/main/asciidoc/_templates/template-reference.adoc

@@ -4,14 +4,15 @@ and pull requests should be submitted there:
 https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 ////
-TODO: See xref:{doc-guides}/doc-reference.adoc[Quarkus style and content guidelines] for details
-- Title should have an implied "About..." in front. 
-- ID should end with '-reference' (using the filename works)
-- choose appropriate categories
+TODO: 
+- Title: https://quarkus.io/guides/doc-reference#titles-headings
+- Use the file name as the ID
+- Choose appropriate categories: https://quarkus.io/guides/doc-reference#categories
 ////
-[id="...-reference"]
+[id="..."]
 = Title using sentence capitalization
 include::_attributes.adoc[]
+:diataxis-type: reference
 :categories: ...
 ////
 :extension-status: preview

docs/src/main/asciidoc/_templates/template-tutorial.adoc

@@ -4,14 +4,15 @@ and pull requests should be submitted there:
 https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 ////
-TODO: See xref:{doc-guides}/doc-reference.adoc[Quarkus style and content guidelines]for details
-- Finish a sentence like: "Create a ...", "How to ..." 
-- ID should end with '-tutorial' (using the filename works)
-- choose appropriate categories 
+TODO: 
+- Title: https://quarkus.io/guides/doc-reference#titles-headings
+- Use the file name as the ID
+- Choose appropriate categories: https://quarkus.io/guides/doc-reference#categories
 ////
-[id="...-tutorial"]
+[id="..."]
 = Title using sentence capitalization
 include::_attributes.adoc[]
+:diataxis-type: tutorial
 :categories: ...
 ////
 :extension-status: preview

docs/src/main/asciidoc/deploying-to-openshift.adoc

@@ -115,16 +115,16 @@ So unless you've used the `quarkus.openshift.route.expose` config property to ex
 .Expose The Service - OpenShift CLI Example
 [source,bash,subs=attributes+]
 ----
-oc expose svc/greeting <1>
+oc expose svc/openshift-quickstart <1>
 oc get routes <2>
-curl http://<route>/greeting <3>
+curl http://<route>/hello <3>
 ----
 <1> Expose the service.
 <2> Get the list of exposed routes.
 <3> Access your application.
 
 [[control_application_config]]
-=== Configure the OpenShift Application Manually 
+=== Configure the OpenShift Application Manually
 
 If you need more control over the deployment configuration you can build the container image first and then configure the OpenShift application manually.
 
@@ -147,7 +147,7 @@ During the build you may find the `Caused by: javax.net.ssl.SSLHandshakeExceptio
 quarkus.kubernetes-client.trust-certs=true
 ----
 
-For more information, see link:https://quarkus.io/guides/deploying-to-kubernetes#client-connection-configuration[deploying to kubernetes].
+For more information, see link:https://quarkus.io/guides/deploying-to-kubernetes#client-connection-configuration[deploying to Kubernetes].
 ====
 
 Once the build is done we can create a new application from the relevant `ImageStream`.
@@ -159,7 +159,7 @@ oc new-app --name=greeting <project>/openshift-quickstart:1.0.0-SNAPSHOT <2>
 oc get svc
 oc expose svc/greeting <3>
 oc get routes <4>
-curl http://<route>/greeting <5>
+curl http://<route>/hello <5>
 ----
 <1> Lists the image streams created. The image stream of our application should be tagged as <project>/openshift-quickstart:1.0.0-SNAPSHOT.
 <2> Create a new application from the image source.
@@ -177,7 +177,7 @@ Out of the box the OpenShift extension is configured to use xref:container-image
 - xref:container-image.adoc#docker[container-image-docker]
 - xref:container-image.adoc#jib[container-image-jib]
 
-When a non-s2i container image extension is used, an `ImageStream` is created that is pointing to an external `dockerImageRepository`. The image is built and pushed to the registry and the `ImageStream` populates the tags that are available in the `dockerImageRepository`. 
+When a non-s2i container image extension is used, an `ImageStream` is created that is pointing to an external `dockerImageRepository`. The image is built and pushed to the registry and the `ImageStream` populates the tags that are available in the `dockerImageRepository`.
 
 To select which extension will be used for building the image:
 

docs/src/main/asciidoc/doc-concept.adoc

@@ -6,6 +6,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 [id="doc-concept"]
 = Quarkus documentation content types
 include::_attributes.adoc[]
+:diataxis-type: concept
 :categories: contributing
 :fn-diataxis: footnote:diataxis[Procida, D. Diátaxis documentation framework. https://diataxis.fr/]
 

docs/src/main/asciidoc/doc-contribute-docs-howto.adoc

@@ -5,6 +5,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 [id="doc-contribute-howto"]
 = Contribute to Quarkus documentation
 include::_attributes.adoc[]
+:diataxis-type: howto
 :categories: contributing
 :fn-diataxis: footnote:diataxis[Procida, D. Diátaxis documentation framework. https://diataxis.fr/]
 
@@ -39,28 +40,32 @@ To ensure that your content shows up correctly on the link:https://quarkus.io/gu
 TIP: To help you decide, see the content type descriptions in xref:{doc-guides}/doc-reference.adoc#titles-and-headings[Titles and headings] on the "About Quarkus documentation" page.
 
 . Go to the `src/main/asciidoc/_templates` directory, and make a copy of the relevant template for the content type you have chosen. Be sure to:
-** Use the filename syntax of`<category>-<titlekeyword>-<titlekeyword>-<content-type>.adoc`. For example, `security-basic-authentication-tutorial.adoc`.
+** Use the filename syntax of`<category>-<titlekeyword>-<titlekeyword>.adoc`. For example, `security-basic-authentication.adoc`.
+** Include the diataxis type (concept, howto, reference, tutorial) in the file name if it makes sense to do so.
+For example, `telemetry-micrometer.adoc` is a reference, and `telemetry-micrometer-tutorial.adoc` is a tutorial.
 ** Save the file to the `docs/src/main/asciidoc` folder in the `quarkus` repository.
 
 . Set the minimum required header information to ensure that the content renders correctly in the website portal and on the documentation home page, as outlined in the following example:
 +
 [source,asciidoc]
 ----
-[id="security-basic-authentication-howto"] <1>
+[id="security-basic-authentication"] <1>
 = Secure a Quarkus application with basic authentication <2>
 include::_attributes.adoc[] <3>
-:categories: security,web <4>
-<5>
+:diataxis-type: howto <4>
+:categories: security,web <5>
+<6>
 ----
-<1> Set the `id` value to be the same as the file name but without the extension. You can shorten this if the file name is too long.
+<1> Set the `id` value to be the same as the file name but without the extension. 
 <2> For information about how to create a good title for each content type, see xref:{doc-guides}/doc-reference.adoc#titles-and-headings[Titles and headings] on the "Quarkus style and content guidelines" page.
 <3> The `_attributes.adoc` include is required to ensure that attributes get resolved and the table of contents is generated.
-<4> Set at least one category to ensure that the content is findable on the link:https://quarkus.io/guides/[Quarkus documentation home page]. For a list of Quarkus categories, see xref:{doc-guides}/doc-reference.adoc#document-attributes-and-variables[Document attributes and variables] on the "Quarkus style and content guidelines" page.
-<5> Insert a blank line before the abstract.
+<4> Specify the diataxis type: `concept`, `howto`, `reference`, or `tutorial`.
+<5> Set at least one category to ensure that the content is findable on the link:https://quarkus.io/guides/[Quarkus documentation home page]. For a list of Quarkus categories, see xref:{doc-guides}/doc-reference.adoc#document-attributes-and-variables[Document attributes and variables] on the "Quarkus style and content guidelines" page.
+<6> Insert a blank line after all document attributes and before the abstract.
 +
 [IMPORTANT]
 ====
-Ensure there are no line breaks in the header section until after `:categories:` line.
+Ensure there are no blank lines between the document id and title, the attribute include (`include::_attributes.adoc[]`) and the declaration of other document attributes(`:attribute:`).
 ====
 
 . Add an abstract that describes the purpose of the guide.

docs/src/main/asciidoc/doc-create-tutorial.adoc

@@ -6,6 +6,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 [id="doc-create-tutorial"]
 = Creating a tutorial
 include::_attributes.adoc[]
+:diataxis-type: tutorial
 :categories: contributing
 
 Create a new tutorial that guides users through creating, running, and testing a Quarkus application that uses annotations from an imaginary extension.
@@ -29,7 +30,8 @@ For this example, we will use `acme-serve-http-requests-tutorial.adoc`:
 
 - `acme-` will group this guide with other resources related to the acme extension
 - `serve-http-requests` is a derivative of the document title
-- `-tutorial.adoc` will indicate that this document is a tutorial
+- `-tutorial` will indicate that this document is a tutorial (optional)
+- `.adoc` to indicate this is an asciidoc file
 
 == Copy the tutorial template
 
@@ -46,7 +48,7 @@ include::_attributes.adoc[] // <3>
 :extension-status: experimental // <5>
 ----
 
-<1> Specify a unique id for the section in lower-kebab-case.
+<1> Use the file name as a unique id for the section.
 <2> Add the title as a top-level heading.
 <3> Include additional attributes that help define consistent formatting and provide source portability.
 <4> Specify the `web` category, as our imaginary extension works with Http requests.