Merge branch 'docs/restructure-native-executable-guide' of https://github.com/KohiiTM/quarkus into docs/restructure-native-executable-guide

Author: KohiiTM

bom/application/pom.xml

@@ -17,8 +17,8 @@
         <angus-activation.version>2.0.2</angus-activation.version>
         <angus-mail.version>2.0.4</angus-mail.version> <!-- keep in sync with angus-activation (mail depends on activation) -->
         <bouncycastle.version>1.81</bouncycastle.version>
-        <bouncycastle.fips.version>1.0.2.5</bouncycastle.fips.version>
-        <bouncycastle.tls.fips.version>1.0.19</bouncycastle.tls.fips.version>
+        <bouncycastle.fips.version>2.1.1</bouncycastle.fips.version>
+        <bouncycastle.tls.fips.version>2.1.20</bouncycastle.tls.fips.version>
         <cyclonedx.version>9.0.5</cyclonedx.version>
         <expressly.version>6.0.0</expressly.version>
         <findbugs.version>3.0.2</findbugs.version>
@@ -99,9 +99,9 @@
              hibernate-search.version, antlr.version, bytebuddy.version -->
         <narayana.version>7.2.2.Final</narayana.version>
         <narayana-lra.version>1.0.1.Final</narayana-lra.version>
-        <agroal.version>2.7.1</agroal.version>
+        <agroal.version>2.8</agroal.version>
         <jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
-        <elasticsearch-opensource-components.version>9.1.0</elasticsearch-opensource-components.version>
+        <elasticsearch-opensource-components.version>9.1.2</elasticsearch-opensource-components.version>
         <rxjava.version>2.2.21</rxjava.version>
         <wildfly.openssl-java.version>2.2.5.Final</wildfly.openssl-java.version>
         <wildfly.openssl-linux.version>2.2.2.SP01</wildfly.openssl-linux.version>
@@ -160,7 +160,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.11.0</flyway.version>
+        <flyway.version>11.11.1</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.33.0</liquibase.version>
@@ -207,7 +207,7 @@
         <jansi.version>2.4.0</jansi.version> <!-- Keep in sync with aesh-readline and dekorate -->
         <!-- these two artifacts needs to be compatible together -->
         <strimzi-oauth.version>0.16.1</strimzi-oauth.version>
-        <strimzi-oauth.nimbus.version>10.4.1</strimzi-oauth.nimbus.version>
+        <strimzi-oauth.nimbus.version>10.4.2</strimzi-oauth.nimbus.version>
         <jose4j.version>0.9.6</jose4j.version>
         <java-buildpack-client.version>0.0.14</java-buildpack-client.version>
         <crac.version>1.5.0</crac.version>

bom/dev-ui/pom.xml

@@ -13,7 +13,7 @@
     <description>Dependency management for dev-ui. Importable by third party extension developers.</description>
 
     <properties>
-        <vaadin.version>24.8.4</vaadin.version>
+        <vaadin.version>24.8.5</vaadin.version>
         <lit.version>3.3.1</lit.version>
         <lit-element.version>4.2.1</lit-element.version>
         <lit-html.version>3.3.1</lit-html.version>

build-parent/pom.xml

@@ -73,7 +73,7 @@
         <volume.access.modifier>:Z</volume.access.modifier>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>9.1.0</elasticsearch-server.version>
+        <elasticsearch-server.version>9.1.2</elasticsearch-server.version>
         <elasticsearch.image>docker.io/elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
         <logstash.image>docker.io/elastic/logstash:${elasticsearch-server.version}</logstash.image>
         <kibana.image>docker.io/elastic/kibana:${elasticsearch-server.version}</kibana.image>

core/deployment/src/main/java/io/quarkus/deployment/builditem/AdditionalIndexedClassesBuildItem.java

@@ -1,6 +1,5 @@
 package io.quarkus.deployment.builditem;
 
-import java.util.Collections;
 import java.util.Set;
 
 import io.quarkus.builder.item.MultiBuildItem;
@@ -18,7 +17,7 @@ public AdditionalIndexedClassesBuildItem(String... classesToIndex) {
     }
 
     public AdditionalIndexedClassesBuildItem(String classToIndex) {
-        this.classesToIndex = Collections.singleton(classToIndex);
+        this.classesToIndex = Set.of(classToIndex);
     }
 
     public Set<String> getClassesToIndex() {

core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java

@@ -3,7 +3,6 @@
 import static io.smallrye.config.ConfigMappings.ConfigClass.configClass;
 import static org.jboss.jandex.AnnotationTarget.Kind.CLASS;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -222,7 +221,7 @@ private static Set<Type> collectTypes(CombinedIndexBuildItem combinedIndex, Clas
         DotName configIfaceName = DotName.createSimple(configClass.getName());
         ClassInfo configIfaceInfo = index.getClassByName(configIfaceName);
         if ((configIfaceInfo == null) || configIfaceInfo.interfaceNames().isEmpty()) {
-            return Collections.singleton(Type.create(configIfaceName, Type.Kind.CLASS));
+            return Set.of(Type.create(configIfaceName, Type.Kind.CLASS));
         }
 
         Set<DotName> allIfaces = new HashSet<>();

devtools/cli/src/main/java/io/quarkus/cli/config/Encrypt.java

@@ -51,6 +51,10 @@ public Integer call() throws Exception {
             encryptionKey = encodeToString(generateEncryptionKey().getEncoded());
             generatedKey = true;
         } else {
+            if (encryptionKey.startsWith("\\\"") && encryptionKey.endsWith("\"\\")) {
+                encryptionKey = encryptionKey.substring(2, encryptionKey.length() - 2);
+            }
+
             if (encryptionKeyFormat.equals(KeyFormat.base64)) {
                 encryptionKey = encodeToString(encryptionKey.getBytes());
             }

devtools/cli/src/main/java/io/quarkus/cli/config/SetConfig.java

@@ -46,14 +46,14 @@ public Integer call() throws Exception {
                 value = findKey(lines, name).getValue();
             }
             args.add(value);
-            if (value == null || value.length() == 0) {
+            if (value == null || value.isEmpty()) {
                 output.error("Cannot encrypt an empty value");
                 return -1;
             }
 
             ConfigValue encryptionKey = findKey(lines, "smallrye.config.secret-handler.aes-gcm-nopadding.encryption-key");
             if (encryptionKey.getValue() != null) {
-                args.add("--key=" + encryptionKey.getValue());
+                args.add("--key=\\\"" + encryptionKey.getValue() + "\"\\");
             }
             ConfigValue encryptionDecode = findKey(lines,
                     "smallrye.config.secret-handler.aes-gcm-nopadding.encryption-key-decode");

docs/src/main/asciidoc/dev-mcp.adoc

@@ -12,7 +12,7 @@ include::_attributes.adoc[]
 [IMPORTANT]
 .Experimental
 ====
-This feature is currently experimental. To enable it, set `quarkus.dev-mcp.enabled=true` in your application properties.
+This feature is currently experimental.
 ====
 
 == Overview
@@ -22,11 +22,13 @@ It presents the methods used by the DevUI *MCP tools* (methods you can call) and
 
 === Connecting an MCP client
 
-Open the **Dev MCP** menu in the Dev UI to see the MCP server’s URL. (Default `http://localhost:8080/q/dev-mcp`). 
+Open the **Dev UI** settings dialog and select the Dev MCP tab.
+There you can enable Dev MCP, get the connection details (Default `http://localhost:8080/q/dev-mcp`) and see what clients are connected.
+
 Any MCP client that supports the https://modelcontextprotocol.io/specification/2025-03-26[Streamable Protocol, version 2025‑03‑26] can connect using that URL. 
-After a client connects, it appears on the *MCP Info* page of the Dev UI.
+After a client connects, it will appears on the tab:
 
-image::dev_mcp_info_screen.png[Dev MCP Info, width=100%]
+image::dev_mcp_settings.png[Dev MCP Settings]
 
 == Guide for extension developers
 

docs/src/main/asciidoc/dev-ui.adoc

@@ -35,6 +35,7 @@ The basic layout has the following parts:
 - Page
 - Footer
 - Card
+- Settings
 
 Below is a visual overview of the layout:
 
@@ -144,6 +145,18 @@ TIP: Clicking a page link inside a card navigates to a dedicated UI page for tha
 
 Extensions are free to customize their cards and add interactive behaviors based on what they provide at runtime.
 
+==== Settings
+
+image::devui_layout_settings.png[Dev UI Settings]
+
+The settings page is a dialog that contains settings for Dev UI:
+
+- Theme (Change between Desktop/Light/Dark
+- Bugs / Feature requests
+- Storage (Manage local browser storage used in Dev UI)
+- Dev MCP (Enable your Dev Mode to expose a MCP Server)
+- ... and more... (Other extensions might add to this)
+
 == Guide for Extension Developers
 
 Quarkus extensions can enhance the developer experience by contributing to the Dev UI. The rest of this guide outlines how to integrate your extension into the Dev UI, covering metadata configuration, adding pages to the card, menu, and footer, and best practices for dynamic content.
@@ -193,6 +206,8 @@ Extensions can contribute interactive pages to the Dev UI in the following areas
 - **Card**: Add links to pages directly on the extension card.
 - **Footer**: Add tabs to the footer for logs or other runtime information.
 - **Menu**: Add pages to the Dev UI's left-hand menu.
+- **Settings**: Add a tab to the settings dialog
+- **Unlisted**: Pages that are not listed anywhere above, but are added to the router and can be linked to.
 
 ==== Card
 
@@ -373,6 +388,99 @@ The key will be scoped automatically, so you do not have to prefix any namespace
 
 image::devui_jokes_light.png[Dev UI Jokes, width=100%]
 
+==== Settings
+
+To add a tab to the Dev UI settings dialog, produce a `SettingPageBuildItem`:
+
+[source,java]
+----
+    @BuildStep(onlyIf = IsLocalDevelopment.class) // <1>
+    void createMCPSettingsTab(BuildProducer<SettingPageBuildItem> settingPageProducer) {
+
+        SettingPageBuildItem mcpSettingTab = new SettingPageBuildItem("Dev MCP");// <2>
+
+        mcpSettingTab.addPage(Page.webComponentPageBuilder() // <3>
+                .title("Dev MCP")// <4>
+                .icon("font-awesome-solid:robot") // <5>
+                .componentLink("qwc-dev-mcp-setting.js")); // <6>
+        settingPageProducer.produce(mcpSettingTab);
+    }
+}
+----
+<1> Always make sure that this build step is only run when in local dev mode.
+<2> To add anything on the settings tab, you must return/produce a `SettingPageBuildItem`.
+<3> To add a tab in the setting dialog, you can use the `addPage` method.
+<4> You can (optionally) add the title, else it will be derived from the component link.
+<5> You can add an icon. All free font-awesome icons are available.
+<6> Add the link to the web component source (`js`) file in `deployment/src/main/resources/dev-ui/`. This has to take the format of qwc-extensionname-pagename.js
+
+This page will will be loaded as the content for that tab in the settings dialog
+
+===== Optional: Build Time Data
+
+You can pass data gathered during build to the Page (js):
+
+[source,java]
+----
+mcpSettingTab.addBuildTimeData("key", values);
+----
+
+You can add multiple of these key-value pairs for all the data you know at build time that you need on the page.
+
+==== Unlisted Page
+
+Lastly, you can add pages that is not listed anywhere, but added to the Router, and can be navigated to. This is usefull if you are building very complex pages that navigates to more pages.
+
+To do this, produce a `UnlistedPageBuildItem`:
+
+[source,java]
+----
+    @BuildStep(onlyIf = IsLocalDevelopment.class) // <1>
+    void createMCPUnlistedPages(BuildProducer<UnlistedPageBuildItem> unlistedPageProducer) {
+
+        UnlistedPageBuildItem mcpOtherPages = new UnlistedPageBuildItem("Dev MCP"); // <2>
+
+        mcpOtherPages.addPage(Page.webComponentPageBuilder() // <3>
+                .title("Tools") // <4>
+                .icon("font-awesome-solid:screwdriver-wrench") // <5>
+                .componentLink("qwc-dev-mcp-tools.js"));  // <6>
+        unlistedPageProducer.produce(mcpOtherPages);
+    }
+}
+----
+<1> Always make sure that this build step is only run when in local dev mode.
+<2> To add an unlisted page, you must return/produce a `UnlistedPageBuildItem`.
+<3> Use the `addPage` method.
+<4> You can (optionally) add the title, else it will be derived from the component link.
+<5> You can add an icon. All free font-awesome icons are available.
+<6> Add the link to the web component source (`js`) file in `deployment/src/main/resources/dev-ui/`. This has to take the format of qwc-extensionname-pagename.js
+
+This page will will be registered to the Router and can be nagigated to by a normal link or using the Router:
+
+[source,javascript]
+----
+import { RouterController } from 'router-controller'; // <1>
+
+// ...
+
+routerController = new RouterController(this); // <2>
+
+// ...
+
+let unlistedPages = this.routerController.getPagesForCurrentNamespace(); // <3>
+// or if you not in your own space
+// let unlistedPages = this.routerController.getPagesForNamespace("your namespace"); // <4>
+
+// ... loop over page
+this.routerController.go(page); // <5>
+----
+<1> Import the RouterController
+<2> Create a new instance passing in this to scope it to your namespace
+<3> Get all pages of your namespace
+<4> Or if you are on another page (not one of yours) you can get the pages for your namespace
+<5> Then you can loop over the pages and build the links/buttons. To actions the navigation your use the go method
+
+
 ==== Building Web Components
 
 Dev UI uses https://lit.dev/[Lit] to make building these web components easier. You can read more about Web Components and Lit:
@@ -662,6 +770,42 @@ this.storageControl.set('height', 123); // Set some val
 
 https://github.com/quarkusio/quarkus/blob/main/extensions/devui/resources/src/main/resources/dev-ui/qwc/qwc-footer.js[Example code]
 
+======= Per Application
+
+You can narrow the score of the storage further by the current application:
+
+[source,javascript]
+----
+storageControl = new StorageController(this, true); // Passing in true will scope per application
+----
+
+======= Storage Setting
+
+Users can have a raw view on the storage in the settings page:
+
+image::dev-ui-storage-settings.png[alt=Dev UI Storage Settings,role="center"]
+
+Because users can clean/revert to default in this screen by deleting the storage item, an extension might want to react on this:
+
+[source,javascript]
+----
+connectedCallback() {
+        super.connectedCallback();
+        window.addEventListener('storage-changed', this._storageChange); // Listen for storage changes
+}
+
+disconnectedCallback() {
+        window.removeEventListener('storage-changed', this._storageChange); // Clean up
+        super.disconnectedCallback();
+}
+
+_storageChange = (e) => {
+    if(e.detail.method === "remove" && e.detail.key.startsWith("qwc-myextensionname-")){ // Only care about remove and your extension
+        // React on storage removal
+    }
+}
+
+----
 
 ====== Log